webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

initskripts: remove obsolete checkfstab

Browse Source 
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 <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2016-05-06 15:40:38 +02:00
parent be700f1806
commit 3917eadc29
5 changed files with 7 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/common/i586/initscripts
View File

@@ -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

2
config/rootfiles/common/x86_64/initscripts
View File

@@ -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

4
config/rootfiles/core/103/update.sh
View File

@@ -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

7
lfs/initscripts Executable file → Normal file
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# 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)

66
src/initscripts/init.d/checkfstab
View File

@@ -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