mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'upgpkg: added torrent creation to scripts, added latest initscript changes, updated udev.rules,
unload already loaded intel wireless drivers first, added release name to config files instead of rc.sysinit check'
This commit is contained in:
parent
061a334dd5
commit
ddd268c971
13 changed files with 50 additions and 43 deletions
10
etc/inittab
10
etc/inittab
|
@ -13,11 +13,11 @@ id:2:initdefault:
|
||||||
rc::sysinit:/etc/rc.sysinit
|
rc::sysinit:/etc/rc.sysinit
|
||||||
rh:06:wait:/etc/rc.shutdown
|
rh:06:wait:/etc/rc.shutdown
|
||||||
|
|
||||||
#c0:2:respawn:/sbin/agetty -n -l /etc/login.sh 9600 ttyS0 linux
|
#c0:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 9600 ttyS0 linux
|
||||||
c1:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/1 linux
|
c1:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/1 linux
|
||||||
c2:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/2 linux
|
c2:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/2 linux
|
||||||
c3:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/3 linux
|
c3:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/3 linux
|
||||||
c4:2:respawn:/sbin/agetty -n -l /etc/login.sh 38400 vc/4 linux
|
c4:2:respawn:/sbin/agetty -8 -n -l /etc/login.sh 38400 vc/4 linux
|
||||||
|
|
||||||
ca::ctrlaltdel:/sbin/shutdown -t3 -r now
|
ca::ctrlaltdel:/sbin/shutdown -t3 -r now
|
||||||
|
|
||||||
|
|
14
etc/rc.conf
14
etc/rc.conf
|
@ -21,9 +21,10 @@ USECOLOR="yes"
|
||||||
#
|
#
|
||||||
# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp")
|
# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp")
|
||||||
#
|
#
|
||||||
lo="lo 127.0.0.1"
|
# Don't use this for wireless interfaces, see network profiles below
|
||||||
|
#
|
||||||
eth0="eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255"
|
eth0="eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255"
|
||||||
INTERFACES=(lo !eth0)
|
INTERFACES=(!eth0)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Routes to start at boot-up (in this order)
|
# Routes to start at boot-up (in this order)
|
||||||
|
@ -32,6 +33,15 @@ INTERFACES=(lo !eth0)
|
||||||
#
|
#
|
||||||
gateway="default gw 192.168.0.1"
|
gateway="default gw 192.168.0.1"
|
||||||
ROUTES=(!gateway)
|
ROUTES=(!gateway)
|
||||||
|
#
|
||||||
|
# Enable these network profiles at boot-up. These are only useful
|
||||||
|
# if you happen to need multiple network configurations (ie, laptop users)
|
||||||
|
# - set to 'menu' to present a menu during boot-up (dialog package required)
|
||||||
|
# - prefix an entry with a ! to disable it
|
||||||
|
#
|
||||||
|
# Network profiles are found in /etc/network-profiles
|
||||||
|
#
|
||||||
|
#NET_PROFILES=(main)
|
||||||
|
|
||||||
# -----------------------------------------------------------------------
|
# -----------------------------------------------------------------------
|
||||||
# DAEMONS
|
# DAEMONS
|
||||||
|
|
|
@ -11,15 +11,16 @@ echo "Shutting Down ..."
|
||||||
|
|
||||||
# Shutdown daemons
|
# Shutdown daemons
|
||||||
let i=${#DAEMONS[@]}
|
let i=${#DAEMONS[@]}
|
||||||
while [[ i -ge 0 ]]; do
|
|
||||||
if [[ `echo ${DAEMONS[$i]} | grep '^[^\!]' | wc -l` -eq 1 ]]; then
|
while [ $i -ge 0 ]; do
|
||||||
/etc/rc.d/${DAEMONS[$i]#@} stop
|
if [ "${DAEMONS[$i]:0:1}" != '!' ]; then
|
||||||
|
ck_daemon ${DAEMONS[$i]#@} || /etc/rc.d/${DAEMONS[$i]#@} stop
|
||||||
fi
|
fi
|
||||||
let i=i-1
|
let i=i-1
|
||||||
done
|
done
|
||||||
# find any leftover daemons and shut them down
|
# find any leftover daemons and shut them down
|
||||||
if [ -d /var/run/daemons ]; then
|
if [ -d /var/run/daemons ]; then
|
||||||
for daemon in `ls /var/run/daemons`; do
|
for daemon in $(ls -1t /var/run/daemons); do
|
||||||
/etc/rc.d/$daemon stop
|
/etc/rc.d/$daemon stop
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -14,6 +14,17 @@ else
|
||||||
/bin/dmesg -n 3
|
/bin/dmesg -n 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# bring up the loopback interface
|
||||||
|
if [ -d /sys/class/net/lo ]; then
|
||||||
|
stat_busy "Bringing up loopback interface"
|
||||||
|
ifconfig lo 127.0.0.1 up
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
stat_fail
|
||||||
|
else
|
||||||
|
stat_done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Start daemons
|
# Start daemons
|
||||||
for daemon in "${DAEMONS[@]}"; do
|
for daemon in "${DAEMONS[@]}"; do
|
||||||
if [ "$daemon" = "${daemon#!}" ]; then
|
if [ "$daemon" = "${daemon#!}" ]; then
|
||||||
|
|
|
@ -206,7 +206,7 @@ KERNEL=="psaux", NAME="misc/%k", SYMLINK+="%k"
|
||||||
KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k" GROUP="video"
|
KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k" GROUP="video"
|
||||||
KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k"
|
KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k"
|
||||||
KERNEL=="random", MODE="0666"
|
KERNEL=="random", MODE="0666"
|
||||||
KERNEL=="urandom", MODE="0444"
|
KERNEL=="urandom", MODE="0666"
|
||||||
KERNEL=="mem", MODE="0640", GROUP="kmem"
|
KERNEL=="mem", MODE="0640", GROUP="kmem"
|
||||||
KERNEL=="kmem", MODE="0640", GROUP="kmem"
|
KERNEL=="kmem", MODE="0640", GROUP="kmem"
|
||||||
KERNEL=="port", MODE="0640", GROUP="kmem"
|
KERNEL=="port", MODE="0640", GROUP="kmem"
|
||||||
|
@ -342,7 +342,7 @@ KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODE
|
||||||
KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
|
KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
|
||||||
|
|
||||||
KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394"
|
KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394"
|
||||||
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id --export"
|
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", SUBSYSTEMS=="usb", IMPORT{program}="/lib/udev/usb_id --export"
|
||||||
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
|
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
|
||||||
KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
|
KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
|
||||||
KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
|
KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
|
||||||
|
|
|
@ -50,6 +50,7 @@ run_hook ()
|
||||||
echo "Place external addon packages in /packages directory."
|
echo "Place external addon packages in /packages directory."
|
||||||
echo "Place external configs in /config directory."
|
echo "Place external configs in /config directory."
|
||||||
echo "------------------"
|
echo "------------------"
|
||||||
|
echo "Message is displayed 10 seconds ..."
|
||||||
echo ""
|
echo ""
|
||||||
sleep 10
|
sleep 10
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -6,6 +6,11 @@ run_hook ()
|
||||||
echo "You ACCEPTED the intel's licenses, intel wireless drivers are now available."
|
echo "You ACCEPTED the intel's licenses, intel wireless drivers are now available."
|
||||||
! [ -d /lib/firmware/ ] && mkdir -p /lib/firmware
|
! [ -d /lib/firmware/ ] && mkdir -p /lib/firmware
|
||||||
mv /intel-firmware/* /lib/firmware/
|
mv /intel-firmware/* /lib/firmware/
|
||||||
|
echo "Unloading already loaded intel wireless modules ..."
|
||||||
|
modprobe -r ipw2100 > /dev/null 2>&1
|
||||||
|
modprobe -r ipw2200 > /dev/null 2>&1
|
||||||
|
modprobe -r iwl3945 > /dev/null 2>&1
|
||||||
|
modprobe -r iwl4965 > /dev/null 2>&1
|
||||||
echo "Retrigger udev uevents ..."
|
echo "Retrigger udev uevents ..."
|
||||||
/etc/start_udev uevents
|
/etc/start_udev uevents
|
||||||
else
|
else
|
||||||
|
@ -22,6 +27,7 @@ run_hook ()
|
||||||
echo "/lib/firmware/LICENSE.ipw2100-fw"
|
echo "/lib/firmware/LICENSE.ipw2100-fw"
|
||||||
echo "By appending intel-wireless to boot prompt you accept those licenses!"
|
echo "By appending intel-wireless to boot prompt you accept those licenses!"
|
||||||
echo "--------------------"
|
echo "--------------------"
|
||||||
|
echo "Message is displayed 15 seconds ..."
|
||||||
sleep 15
|
sleep 15
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,7 +88,7 @@ PACKAGEDIR=""
|
||||||
PACMANBINARY=""
|
PACMANBINARY=""
|
||||||
|
|
||||||
# path to rc.sysinit to get arch version
|
# path to rc.sysinit to get arch version
|
||||||
RCSYSINIT="${CVSTREE}/core/base/initscripts/rc.sysinit"
|
ARCHVERSION="Core Dump"
|
||||||
|
|
||||||
#### REMASTER FTP INSTALL MEDIA
|
#### REMASTER FTP INSTALL MEDIA
|
||||||
# No extra parameters needed
|
# No extra parameters needed
|
||||||
|
|
|
@ -87,7 +87,7 @@ PACKAGEDIR=""
|
||||||
PACMANBINARY=""
|
PACMANBINARY=""
|
||||||
|
|
||||||
# path to rc.sysinit to get arch version
|
# path to rc.sysinit to get arch version
|
||||||
RCSYSINIT="${CVSTREE}/core/base/initscripts/rc.sysinit"
|
ARCHVERSION="Core Dump"
|
||||||
|
|
||||||
#### REMASTER FTP INSTALL MEDIA
|
#### REMASTER FTP INSTALL MEDIA
|
||||||
# No extra parameters needed
|
# No extra parameters needed
|
||||||
|
|
|
@ -29,7 +29,7 @@ install ()
|
||||||
### adding needed programs from running system
|
### adding needed programs from running system
|
||||||
add_file "${CONFIG}" "/config"
|
add_file "${CONFIG}" "/config"
|
||||||
SCRIPT="arch_base"
|
SCRIPT="arch_base"
|
||||||
BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vi lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm"
|
BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vi lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput"
|
||||||
add_file "/bin/echo"
|
add_file "/bin/echo"
|
||||||
add_file "/bin/gunzip"
|
add_file "/bin/gunzip"
|
||||||
add_file "/bin/zcat"
|
add_file "/bin/zcat"
|
||||||
|
|
|
@ -29,7 +29,7 @@ install ()
|
||||||
### adding needed programs from running system
|
### adding needed programs from running system
|
||||||
add_file "${CONFIG}" "/config"
|
add_file "${CONFIG}" "/config"
|
||||||
SCRIPT="arch_base_lowmem"
|
SCRIPT="arch_base_lowmem"
|
||||||
BINARIES="init agetty mount modprobe umount head basename clear nano printf tail test tty wc which xargs yes syslog-ng bash swapon uniq cut seq find sort fdisk sfdisk cfdisk gawk cp mv shutdown ls rm sed less chgrp chmod chown df dialog dmesg egrep fgrep grep kill killall killall5 more ps pwd rmdir stty sync tar touch uname hdparm true mktemp chroot dirname bzip2 hwclock depmod cat gzip sdparm expr"
|
BINARIES="init agetty mount modprobe umount head basename clear nano printf tail test tty wc which xargs yes syslog-ng bash swapon uniq cut seq find sort fdisk sfdisk cfdisk gawk cp mv shutdown ls rm sed less chgrp chmod chown df dialog dmesg egrep fgrep grep kill killall killall5 more ps pwd rmdir stty sync tar touch uname hdparm true mktemp chroot dirname bzip2 hwclock depmod cat gzip sdparm expr tput"
|
||||||
add_file "/bin/echo"
|
add_file "/bin/echo"
|
||||||
add_file "/bin/gunzip"
|
add_file "/bin/gunzip"
|
||||||
add_file "/bin/zcat"
|
add_file "/bin/zcat"
|
||||||
|
|
|
@ -10,18 +10,7 @@ install ()
|
||||||
# change to english locale!
|
# change to english locale!
|
||||||
export LANG=en_US
|
export LANG=en_US
|
||||||
CONFIGMSG="INSTALLATION / RESCUEBOOT SYSTEM"
|
CONFIGMSG="INSTALLATION / RESCUEBOOT SYSTEM"
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
NAME=${ARCHVERSION}
|
||||||
CVSMSG=$(mktemp /tmp/archmsg.XXXX)
|
|
||||||
rm ${CVSMSG}
|
|
||||||
mkdir -p ${CVSMSG}
|
|
||||||
# checkout actual name from cvs rc.sysinit
|
|
||||||
export CVSROOT=${ARCH_CVSSETUP}
|
|
||||||
cd ${CVSMSG}
|
|
||||||
cvs -z3 co -r ${TAG} arch/build/base/initscripts/rc.sysinit
|
|
||||||
NAME=$(grep 'Arch' arch/build/base/initscripts/rc.sysinit | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
|
||||||
else
|
|
||||||
NAME=$(grep 'Arch' ${RCSYSINIT} | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
|
||||||
fi
|
|
||||||
echo "Arch Linux" >> ${BOOTMESSAGE}
|
echo "Arch Linux" >> ${BOOTMESSAGE}
|
||||||
echo "http://www.archlinux.org" >> ${BOOTMESSAGE}
|
echo "http://www.archlinux.org" >> ${BOOTMESSAGE}
|
||||||
echo "Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>" >> ${BOOTMESSAGE}
|
echo "Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>" >> ${BOOTMESSAGE}
|
||||||
|
@ -31,7 +20,7 @@ install ()
|
||||||
echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
|
echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
|
||||||
echo "" >> ${BOOTMESSAGE}
|
echo "" >> ${BOOTMESSAGE}
|
||||||
echo "${CONFIGMSG}" >> ${BOOTMESSAGE}
|
echo "${CONFIGMSG}" >> ${BOOTMESSAGE}
|
||||||
echo "${NAME}" >> ${BOOTMESSAGE}
|
echo "Arch Linux ${NAME}" >> ${BOOTMESSAGE}
|
||||||
echo "Kernel: ${USEKERNEL}" >> ${BOOTMESSAGE}
|
echo "Kernel: ${USEKERNEL}" >> ${BOOTMESSAGE}
|
||||||
echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
|
echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
|
||||||
echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
|
echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
|
||||||
|
|
|
@ -10,18 +10,7 @@ install ()
|
||||||
# change to english locale!
|
# change to english locale!
|
||||||
export LANG=en_US
|
export LANG=en_US
|
||||||
CONFIGMSG="INSTALLATION SYSTEM"
|
CONFIGMSG="INSTALLATION SYSTEM"
|
||||||
if ! [ "${LOCALSETUP}" = "yes" ]; then
|
NAME=${ARCHVERSION}
|
||||||
CVSMSG=$(mktemp /tmp/archmsg.XXXX)
|
|
||||||
rm ${CVSMSG}
|
|
||||||
mkdir -p ${CVSMSG}
|
|
||||||
# checkout actual name from cvs rc.sysinit
|
|
||||||
export CVSROOT=${ARCH_CVSSETUP}
|
|
||||||
cd ${CVSMSG}
|
|
||||||
cvs -z3 co -r ${TAG} arch/build/base/initscripts/rc.sysinit
|
|
||||||
NAME=$(grep 'Arch' arch/build/base/initscripts/rc.sysinit | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
|
||||||
else
|
|
||||||
NAME=$(grep 'Arch' ${RCSYSINIT} | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
|
|
||||||
fi
|
|
||||||
echo "Arch Linux" >> ${BOOTMESSAGE}
|
echo "Arch Linux" >> ${BOOTMESSAGE}
|
||||||
echo "http://www.archlinux.org" >> ${BOOTMESSAGE}
|
echo "http://www.archlinux.org" >> ${BOOTMESSAGE}
|
||||||
echo "Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>" >> ${BOOTMESSAGE}
|
echo "Copyright 2002 - 2007 Judd Vinet <jvinet@zeroflux.org>" >> ${BOOTMESSAGE}
|
||||||
|
@ -31,7 +20,7 @@ install ()
|
||||||
echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
|
echo "Creation Tool: '$(echo ${RUNPROGRAM} | sed 's|-grub||')' written by Tobias Powalowski <tpowa@archlinux.org>" >> ${BOOTMESSAGE}
|
||||||
echo "" >> ${BOOTMESSAGE}
|
echo "" >> ${BOOTMESSAGE}
|
||||||
echo "${CONFIGMSG}" >> ${BOOTMESSAGE}
|
echo "${CONFIGMSG}" >> ${BOOTMESSAGE}
|
||||||
echo "${NAME}" >> ${BOOTMESSAGE}
|
echo "Arch Linux ${NAME}" >> ${BOOTMESSAGE}
|
||||||
echo "Kernel: ${USEKERNEL}" >> ${BOOTMESSAGE}
|
echo "Kernel: ${USEKERNEL}" >> ${BOOTMESSAGE}
|
||||||
echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
|
echo "Architecture: $(uname -m)" >> ${BOOTMESSAGE}
|
||||||
echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
|
echo "Creation Date: $(date)" >> ${BOOTMESSAGE}
|
||||||
|
|
Loading…
Reference in a new issue