aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2011-06-05 01:57:31 +0200
committerTom Gundersen <teg@jklm.no>2011-06-05 01:57:31 +0200
commit0dfd69b9e8617ef15413e5022442017603be5344 (patch)
tree7d03111e655e14529f62d5d1041f6f3d0069eecf
parent66f7acdc789099114945f08c92c9957f7e536f2d (diff)
parentd847a204aa5ab21a6c02998846ec3216cc7f887d (diff)
downloadinitscripts-0dfd69b9e8617ef15413e5022442017603be5344.tar.xz
Merge remote-tracking branch 'falconindy/working'
Conflicts: rc.sysinit Conflict with ip move away from /usr
-rw-r--r--rc.conf2
-rwxr-xr-xrc.d4
-rwxr-xr-xrc.multi2
-rwxr-xr-xrc.single2
-rwxr-xr-xrc.sysinit30
5 files changed, 16 insertions, 24 deletions
diff --git a/rc.conf b/rc.conf
index 06db4f0..b9c468a 100644
--- a/rc.conf
+++ b/rc.conf
@@ -17,7 +17,6 @@
# 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
-# VERBOSE: Verbose level (from 1 to 8). man 3 syslog for level info
#
LOCALE="en_US.UTF-8"
DAEMON_LOCALE="no"
@@ -27,7 +26,6 @@ KEYMAP="us"
CONSOLEFONT=
CONSOLEMAP=
USECOLOR="yes"
-VERBOSE="3"
# -----------------------------------------------------------------------
# HARDWARE
diff --git a/rc.d b/rc.d
index 772f2c6..f0c5204 100755
--- a/rc.d
+++ b/rc.d
@@ -56,9 +56,9 @@ case $1 in
cd /
for i; do
if [[ -x "/etc/rc.d/$i" ]]; then
- /usr/bin/env -i "${ENV[@]}" "/etc/rc.d/$i" "$action"
+ /usr/bin/env -i "${ENV[@]}" "/etc/rc.d/$i" "$action"
else
- printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n"
+ printf "${C_OTHER}:: ${C_FAIL}Error: ${C_DONE}Daemon script $i does not exist.\n"
fi
(( ret += !! $? )) # clamp exit value to 0/1
done
diff --git a/rc.multi b/rc.multi
index d8bf126..60bb835 100755
--- a/rc.multi
+++ b/rc.multi
@@ -27,7 +27,7 @@ fi
run_hook multi_end
/bin/touch /var/log/boot
-kill `/bin/cat /run/bootlogd.pid`
+kill $(/bin/cat /run/bootlogd.pid)
/bin/rm /run/bootlogd.pid
# vim: set ts=2 sw=2 noet:
diff --git a/rc.single b/rc.single
index d1191d2..92b8f53 100755
--- a/rc.single
+++ b/rc.single
@@ -49,7 +49,7 @@ if [[ $RUNLEVEL = 1 ]]; then
fi
/bin/touch /var/log/boot
-kill `/bin/cat /run/bootlogd.pid`
+kill $(/bin/cat /run/bootlogd.pid)
/bin/rm /run/bootlogd.pid
# End of file
diff --git a/rc.sysinit b/rc.sysinit
index 12ffa72..5b58270 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -19,7 +19,7 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
# mount /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm (the api filesystems)
/bin/mountpoint -q /proc || /bin/mount -n -t proc proc /proc -o nosuid,noexec,nodev
/bin/mountpoint -q /sys || /bin/mount -n -t sysfs sysfs /sys -o nosuid,noexec,nodev
-/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,noexec,nodev
+/bin/mountpoint -q /run || /bin/mount -n -t tmpfs tmpfs /run -o mode=755,size=10M,nosuid,nodev
if ! /bin/mountpoint -q /dev; then
if /bin/grep -q devtmpfs /proc/filesystems &>/dev/null; then
/bin/mount -n -t devtmpfs udev /dev -o mode=0755,size=10M,nosuid
@@ -36,20 +36,13 @@ fi
# remount root ro to allow for fsck later on, we remount now to
# make sure nothing can open files rw on root which would block a remount
-/bin/findmnt / --options ro &>/dev/null || \
-status "Mounting Root Read-Only" /bin/mount -n -o remount,ro /
+/bin/findmnt / --options ro &>/dev/null ||
+ status "Mounting Root Read-Only" /bin/mount -n -o remount,ro /
# start up our mini logger until syslog takes over
/sbin/minilogd
/sbin/bootlogd -p /run/bootlogd.pid
-# Set console verbosity
-for cmdarg in $(< /proc/cmdline); do
- [[ "$cmdarg" == verbose ]] && VERBOSE=8 && break
- [[ "$cmdarg" =~ verbose=[1-8] ]] && VERBOSE=${BASH_REMATCH[0]-8} && break
-done
-/bin/dmesg -n ${VERBOSE:-3}
-
HWCLOCK_PARAMS="--hctosys"
case $HARDWARECLOCK in
UTC) HWCLOCK_PARAMS+=" --utc";;
@@ -111,8 +104,8 @@ fi
run_hook sysinit_udevsettled
# bring up the loopback interface
-[[ -d /sys/class/net/lo ]] && \
- status "Bringing up loopback interface" /sbin/ip link set up dev lo
+[[ -d /sys/class/net/lo ]] &&
+ status "Bringing up loopback interface" /sbin/ip link set up dev lo
# FakeRAID devices detection
if [[ $USEDMRAID =~ yes|YES && -x /sbin/dmraid ]]; then
@@ -194,7 +187,7 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then
/bin/dd if=${ckdev} of=${ckfile} bs=1 skip=${cka} count=${ckb} >/dev/null 2>&1;;
esac
$CS -d ${ckfile} $4 $open "$a" "$b" >/dev/null
- /bin/dd if=/dev/urandom of=${ckfile} bs=1 count=`stat -c %s ${ckfile}` conv=notrunc >/dev/null 2>&1
+ /bin/dd if=/dev/urandom of=${ckfile} bs=1 count=$(stat -c %s ${ckfile}) conv=notrunc >/dev/null 2>&1
rm ${ckfile};;
/*)
$CS -d "$3" $4 $open "$a" "$b" >/dev/null;;
@@ -317,8 +310,9 @@ stat_busy "Removing Leftover Files"
/bin/rm -rf /tmp/* /tmp/.* &>/dev/null
[[ ! -L /var/lock ]] && /bin/rm -rf /var/lock/*
[[ ! -L /var/run && -d /var/run ]] && /usr/bin/find /var/run/ \! -type d -delete
- [[ ! -L /var/run && ! -L /var/run/daemons ]] && /bin/rm -rf /var/run/daemons \
- && /bin/ln -s /run/daemons /var/run/daemons
+ [[ ! -L /var/run && ! -L /var/run/daemons ]] &&
+ /bin/rm -rf /var/run/daemons &&
+ /bin/ln -s /run/daemons /var/run/daemons
: >| /var/run/utmp
/bin/chmod 0664 /var/run/utmp
/bin/chown root:utmp /var/run/utmp
@@ -369,9 +363,9 @@ set_consolefont
# When the rules are generated before /etc is mounted rw they are saved to /run,
# we therefore need to copy this from /run to /etc. This functionality is going away one day.
for f in cd net; do
- [[ -f /run/udev/tmp-rules--70-persistent-$f.rules ]] || continue
- status "Adding persistent $f udev rules" \
- /bin/cat "/run/udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules"
+ [[ -f /run/udev/tmp-rules--70-persistent-$f.rules ]] || continue
+ status "Adding persistent $f udev rules" \
+ /bin/cat "/run/udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules"
done
/bin/dmesg >| /var/log/dmesg.log