From 999cdeac6af247b3c80b016950e8684857c53ff7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Nov 2009 09:15:13 -0800 Subject: [PATCH] Updated initscripts --- core/initscripts/PKGBUILD | 11 ++++------- core/initscripts/inittab | 13 +++++++------ core/initscripts/rc.conf | 24 ++++++------------------ core/initscripts/rc.shutdown | 7 +++---- core/initscripts/rc.sysinit | 15 ++++++--------- 5 files changed, 26 insertions(+), 44 deletions(-) diff --git a/core/initscripts/PKGBUILD b/core/initscripts/PKGBUILD index b0a4bb7e2..d5e13ca54 100644 --- a/core/initscripts/PKGBUILD +++ b/core/initscripts/PKGBUILD @@ -13,9 +13,6 @@ depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=139-1' 'sysvinit' 'net-tools') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') -#We will change them, so we should keep them in local repo -#Sorry, but they can't be kept in separate directory. Makepkg complains -#about it.. source=('adjtime.cron' 'inittab' 'minilogd.c' @@ -32,7 +29,7 @@ source=('adjtime.cron' 'rc.sysinit') md5sums=('c03a4a5be5e2579b59e0dcd6a21d310b' - '574273c77fff4954c8628418b5c8fc82' + 'b5872d7ed0f129ebd883b9d26033d4fe' '2c2dcc7ce7586f27fc5e6887f8ec74b8' 'e3637ea43f2dbabba7b1b44f94b0277d' 'bd236a57bc00aa4727b98c5ae401c457' @@ -41,10 +38,10 @@ md5sums=('c03a4a5be5e2579b59e0dcd6a21d310b' 'c98f6e640d0aeba23a4aed511c526d19' '3fb0b6e945065ba1d283f136d17d612e' '96fdb70f95844d95a9941ee319601e8d' - '4a44e2c64b6820e67bedd5cd33699ec7' + 'd0841b0139e955d8da162dc33c5002ea' '669ce6d766dd9deb86686219f3763fe4' - '81e36de17d6ebf6fe9a1026a2d6f6f83' - '04476feac2c4aeff97b6d9fcd239f1e0') + 'd907663acca54bb7d01ca1d8cf21d191' + '9719eab844ea82022647f77695f7a929') build() { cd ${startdir}/src/ diff --git a/core/initscripts/inittab b/core/initscripts/inittab index c64bdbd9a..e783cfa7f 100644 --- a/core/initscripts/inittab +++ b/core/initscripts/inittab @@ -24,12 +24,13 @@ rh:06:wait:/etc/rc.shutdown su:S:wait:/sbin/sulogin -p # -8 options fixes umlauts problem on login -c1:2345:respawn:/sbin/agetty -8 38400 tty1 linux -c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux -c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux -c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux -c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux -c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux +s0:12345:respawn:/sbin/agetty -8 115200 ttyS0 vt100 +#c1:2345:respawn:/sbin/agetty -8 38400 tty1 linux +#c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux +#c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux +#c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux +#c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux +#c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux ca::ctrlaltdel:/sbin/shutdown -t3 -r now diff --git a/core/initscripts/rc.conf b/core/initscripts/rc.conf index 263c42c2d..62b9a6179 100644 --- a/core/initscripts/rc.conf +++ b/core/initscripts/rc.conf @@ -1,20 +1,7 @@ # -# /etc/rc.conf - Main Configuration for Arch Linux +# /etc/rc.conf - PlugApps Main Configuration # -# ----------------------------------------------------------------------- -# LOCALIZATION -# ----------------------------------------------------------------------- -# -# LOCALE: available languages can be listed with the 'locale -a' command -# HARDWARECLOCK: set to "UTC" or "localtime", any other value will result -# in the hardware clock being left untouched (useful for virtualization) -# TIMEZONE: timezones are found in /usr/share/zoneinfo -# KEYMAP: keymaps are found in /usr/share/kbd/keymaps -# CONSOLEFONT: found in /usr/share/kbd/consolefonts (only needed for non-US) -# CONSOLEMAP: found in /usr/share/kbd/consoletrans -# USECOLOR: use ANSI color sequences in startup messages -# LOCALE="en_US.UTF-8" HARDWARECLOCK="localtime" TIMEZONE="Canada/Pacific" @@ -46,7 +33,7 @@ USELVM="no" # # HOSTNAME: Hostname of machine. Should also be put in /etc/hosts # -HOSTNAME="myhost" +HOSTNAME="plugbox" # Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available interfaces. # @@ -58,14 +45,15 @@ HOSTNAME="myhost" # DHCP: Set your interface to "dhcp" (eth0="dhcp") # Wireless: See network profiles below # -usb0="usb0 192.168.0.202 up" -INTERFACES=(usb0) + +eth0="dhcp" +INTERFACES=(eth0) # Routes to start at boot-up (in this order) # Declare each route then list in ROUTES # - prefix an entry in ROUTES with a ! to disable it # -gateway="default gw 192.168.0.200" +gateway="default gw 192.168.0.1" ROUTES=(gateway) # Enable these network profiles at boot-up. These are only useful diff --git a/core/initscripts/rc.shutdown b/core/initscripts/rc.shutdown index e2a4a844a..d5c5b2427 100644 --- a/core/initscripts/rc.shutdown +++ b/core/initscripts/rc.shutdown @@ -10,7 +10,7 @@ /bin/stty onlcr echo " " -printhl "Initiating Shutdown..." +printhl "Shutting down..." echo " " # avoid NIS hanging syslog-ng on shutdown by unsetting the domainname @@ -42,12 +42,12 @@ if [ "$PREVLEVEL" = "3" -o "$PREVLEVEL" = "5" ]; then fi # Terminate all processes -stat_busy "Sending SIGTERM To Processes" +stat_busy "Terminating Processes" /sbin/killall5 -15 &> /dev/null /bin/sleep 5 stat_done -stat_busy "Sending SIGKILL To Processes" +stat_busy "Killing Processes" /sbin/killall5 -9 &> /dev/null /bin/sleep 1 stat_done @@ -146,4 +146,3 @@ else fi # End of file -# vim: set ts=2 sw=2 noet: diff --git a/core/initscripts/rc.sysinit b/core/initscripts/rc.sysinit index 96966fb00..75c6378ea 100644 --- a/core/initscripts/rc.sysinit +++ b/core/initscripts/rc.sysinit @@ -7,11 +7,9 @@ . /etc/rc.d/functions echo " " -printhl "Arch Linux\n" -printhl "${C_H2}http://www.archlinux.org" -printhl "Copyright 2002-2007 Judd Vinet" -printhl "Copyright 2007-2009 Aaron Griffin" -printhl "Distributed under the GNU General Public License (GPL)" +printhl "PlugApps Linux\n" +printhl "${C_H2}http://www.plugapps.com" +printhl "Copyright 2009 Mike Staszel" printsep # mount /proc, /sys and our RAM /dev @@ -60,7 +58,7 @@ fi echo > /proc/sys/kernel/hotplug if [ -x /sbin/udevadm ]; then - stat_busy "Starting UDev Daemon" + stat_busy "Starting UDev" /sbin/udevd --daemon stat_done else @@ -256,11 +254,11 @@ if [ -x /sbin/fsck ]; then echo echo "********************** REBOOT REQUIRED *********************" echo "* *" - echo "* The system will be rebooted automatically in 15 seconds. *" + echo "* The system will be rebooted automatically in 10 seconds. *" echo "* *" echo "************************************************************" echo - /bin/sleep 15 + /bin/sleep 10 fsck_reboot fi if [ ${fsckret} -gt 1 -a ${fsckret} -ne 32 ]; then @@ -421,4 +419,3 @@ fi /bin/dmesg >| /var/log/dmesg.log # End of file -# vim: set ts=2 noet: