From: Arne Fitzenreiter Date: Fri, 6 May 2016 13:40:38 +0000 (+0200) Subject: initskripts: remove obsolete checkfstab X-Git-Tag: v2.19-core103~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3917eadc29e38b94d58d292250d4494dca3cbbb8;p=ipfire-2.x.git initskripts: remove obsolete checkfstab the file update the bootdevice to uuid in fstab and grub1 config. this is not needed since we use uuid at default and grub2 Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 51185f63ff..0976fe52e6 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -14,7 +14,6 @@ etc/rc.d/init.d/apache etc/rc.d/init.d/beep #etc/rc.d/init.d/bluetooth etc/rc.d/init.d/checkfs -etc/rc.d/init.d/checkfstab #etc/rc.d/init.d/clamav etc/rc.d/init.d/cleanfs #etc/rc.d/init.d/client175 @@ -226,7 +225,6 @@ etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S10udev -etc/rc.d/rcsysinit.d/S19checkfstab etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 51185f63ff..0976fe52e6 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -14,7 +14,6 @@ etc/rc.d/init.d/apache etc/rc.d/init.d/beep #etc/rc.d/init.d/bluetooth etc/rc.d/init.d/checkfs -etc/rc.d/init.d/checkfstab #etc/rc.d/init.d/clamav etc/rc.d/init.d/cleanfs #etc/rc.d/init.d/client175 @@ -226,7 +225,6 @@ etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules etc/rc.d/rcsysinit.d/S10udev -etc/rc.d/rcsysinit.d/S19checkfstab etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S20swap etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh index 924cab3434..2c1d0abd72 100644 --- a/config/rootfiles/core/103/update.sh +++ b/config/rootfiles/core/103/update.sh @@ -43,6 +43,10 @@ done # Stop services +# Remove checkfstab +rm -f /etc/rc.d/init.d/checkfstab +rm -f /etc/rc.d/rcsysinit.d/S19checkfstab + # Extract files extract_files diff --git a/lfs/initscripts b/lfs/initscripts old mode 100755 new mode 100644 index 538ea4d0b7..e731d7f6d3 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team # +# Copyright (C) 2007-2016 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -197,16 +197,15 @@ $(TARGET) : ln -sf any /etc/rc.d/init.d/networking/$$i; \ done - # ARM does not need checkfstab and acpid, intel no swconfig + # ARM does not need acpid, intel no swconfig ifeq "$(MACHINE_TYPE)" "arm" - rm -vf /etc/rc.d/init.d/{acpid,checkfstab} + rm -vf /etc/rc.d/init.d/acpid ln -sf ../init.d/swconfig /etc/rc.d/rcsysinit.d/S73swconfig else rm -vf /etc/rc.d/init.d/swconfig ln -sf ../init.d/acpid /etc/rc.d/rc3.d/S12acpid ln -sf ../init.d/acpid /etc/rc.d/rc0.d/K87acpid ln -sf ../init.d/acpid /etc/rc.d/rc6.d/K87acpid - ln -sf ../init.d/checkfstab /etc/rc.d/rcsysinit.d/S19checkfstab endif @$(POSTBUILD) diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab deleted file mode 100644 index ea845458f8..0000000000 --- a/src/initscripts/init.d/checkfstab +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/checkfstab -# -# Description : Check and repair fstab if the drivename has changed -# -# Authors : Arne Fitzenreiter - arne_f@ipfire.org -# -# Version : 00.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - #Skip if root is set by UUID - if (grep "root=UUID=" /proc/cmdline > /dev/null); then - exit 0; - fi - boot_mesg "Checking fstab bootdevice ..." - read CMDLINE < /proc/cmdline - ROOTPOS=${CMDLINE%%root=*} - ROOTPOS=${#ROOTPOS} - NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`; - OLDBOOT=`cat /etc/fstab | grep -m1 " / " | cut -d" " -f1 | cut -f1`; - OLDDRV=${OLDBOOT::`expr length $OLDBOOT`-1} - NEWDRV=${NEWROOT::`expr length $NEWROOT`-1} - if [ "$OLDDRV" == "$NEWDRV" ]; then - echo_ok; - exit 0; - fi - echo_failure; - boot_mesg "Warning! Bootdrive not match with fstab!" - boot_mesg - boot_mesg "Bootdrive: $NEWDRV" - boot_mesg "fstab-entry: $OLDDRV" - boot_mesg - if [ "${OLDDRV:0:4}" == "UUID" ]; then - #Short sleep because the kernel has not finished hardware detections - #and made many messages here and the password question is not readable - sleep 3 - boot_mesg "${FAILURE}Error OLD Bootdrive is already a UUID. Can't fix." - boot_mesg "${NORMAL}" - sulogin - reboot -f - fi - boot_mesg "Attempt to repair it ..." - mount -o remount,rw / - sed -i -e "s|$OLDDRV|$NEWDRV|g" /etc/fstab - mount /boot - sed -i -e "s|$OLDDRV|$NEWDRV|g" /boot/grub/grub.conf - umount /boot - echo_ok; - exit 0; - ;; - *) - echo "Usage: ${0} {start}" - exit 1 - ;; -esac - -# End $rc_base/init.d/checkfstab