SVN: rc-scripts/trunk/rc.d: init.d/sys-chroots rc.sysinit
glen
glen at pld-linux.org
Sun May 26 21:20:46 CEST 2013
Author: glen
Date: Sun May 26 21:20:46 2013
New Revision: 12662
Modified:
rc-scripts/trunk/rc.d/init.d/sys-chroots
rc-scripts/trunk/rc.d/rc.sysinit
Log:
do not use `:>` which aborts whole script on error
special builtins like `:>` abort whole script on error while `>` doesn't
and that is so by POSIX:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_01
Modified: rc-scripts/trunk/rc.d/init.d/sys-chroots
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/sys-chroots (original)
+++ rc-scripts/trunk/rc.d/init.d/sys-chroots Sun May 26 21:20:46 2013
@@ -53,8 +53,8 @@
chroot $dir sh -c '
. /etc/rc.d/init.d/functions
# Clear mtab
- :>/etc/mtab
- [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+ > /etc/mtab
+ [ -f /etc/cryptomtab ] && > /etc/cryptomtab
# Remove stale backups
rm -f /etc/mtab~ /etc/mtab~~ /etc/cryptomtab~ /etc/cryptomtab~~
@@ -78,12 +78,12 @@
# Clean up utmp/wtmp
if ! is_no "$NEED_XFILES" ; then
- :>/var/run/utmpx
+ > /var/run/utmpx
touch /var/log/wtmpx
chown root:utmp /var/run/utmpx /var/log/wtmpx
chmod 0664 /var/run/utmpx /var/log/wtmpx
else
- :>/var/run/utmp
+ > /var/run/utmp
touch /var/log/wtmp
chown root:utmp /var/run/utmp /var/log/wtmp
chmod 0664 /var/run/utmp /var/log/wtmp
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Sun May 26 21:20:46 2013
@@ -72,7 +72,7 @@
# Remove duplicate entries from mtab (for vserver guest use only)
clean_vserver_mtab() {
- :>/etc/mtab.clean
+ > /etc/mtab.clean
while read device mountpoint line; do
grep -qs "$mountpoint" /etc/mtab.clean || \
echo "$device $mountpoint $line" >> /etc/mtab.clean
@@ -465,8 +465,8 @@
if ! is_yes "$VSERVER"; then
# Clear mtab
- :>/etc/mtab
- [ -f /etc/cryptomtab ] && :>/etc/cryptomtab
+ > /etc/mtab
+ [ -f /etc/cryptomtab ] && > /etc/cryptomtab
# Enter root, /proc, /sys and other into mtab.
mount -f / 2> /dev/null
@@ -963,12 +963,12 @@
{
# Clean up utmp/wtmp
if ! is_no "$NEED_XFILES"; then
- :>/var/run/utmpx
+ > /var/run/utmpx
touch /var/log/wtmpx
chown root:utmp /var/run/utmpx /var/log/wtmpx
chmod 0664 /var/run/utmpx /var/log/wtmpx
else
- :>/var/run/utmp
+ > /var/run/utmp
touch /var/log/wtmp
chown root:utmp /var/run/utmp /var/log/wtmp
chmod 0664 /var/run/utmp /var/log/wtmp
More information about the pld-cvs-commit
mailing list