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

Add emergency shell if filesystem check fail.

Browse Source 
Fix checkfstab for UUID entries.
This commit is contained in:
Arne Fitzenreiter
2010-11-23 14:04:49 +01:00
parent 35f9033587
commit 94f6d10bad
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/initscripts/init.d/checkfs
View File

@@ -98,19 +98,17 @@ case "${1}" in
if [ "${error_value}" -gt 3 -a "${error_value}" -lt 16 ]; then
echo_failure
sleep 2
boot_mesg -n "FAILURE:\n\nFile system errors" ${FAILURE}
boot_mesg -n " were encountered that could not be"
boot_mesg -n " fixed automatically. This system"
boot_mesg -n " cannot continue to boot and will"
boot_mesg -n " therefore be halted until those"
boot_mesg -n " errors are fixed manually by a"
boot_mesg -n " System Administrator.\n\nAfter you"
boot_mesg -n " press Enter, this system will be"
boot_mesg -n " halted and powered off."
boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
boot_mesg -n " System Administrator.\n\n"
boot_mesg "" ${NORMAL}
read -t 60 ENTER
${rc_base}/init.d/halt stop
sulogin
reboot -f
fi
if [ "${error_value}" -ge 16 ]; then

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

@@ -25,7 +25,7 @@ case "${1}" in
read CMDLINE < /proc/cmdline
ROOTPOS=`expr index "$CMDLINE" root=`
NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`;
OLDBOOT=`cat /etc/fstab | grep -m1 "/boot" | cut -d" " -f1 | cut -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
@@ -38,6 +38,15 @@ case "${1}" in
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