brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 20:20:06 +09:00
Code Issues Projects Releases Wiki Activity

More error trapping added

Browse Source
This commit is contained in:
Simon Long 2019-10-02 10:34:14 +01:00
parent 5d6b908685
commit 4722e0859f
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
raspi-config
View File

@ -1934,10 +1934,18 @@ disable_overlayfs() {
} }
enable_bootro() { enable_bootro() {
if get_overlay_now ; then
echo "Overlay in use; cannot update fstab"
return 1
fi
sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults\(.*\)/\1defaults,ro\2/" sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults\(.*\)/\1defaults,ro\2/"
} }
disable_bootro() { disable_bootro() {
if get_overlay_now ; then
echo "Overlay in use; cannot update fstab"
return 1
fi
sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults,ro\(.*\)/\1defaults\2/" sed -i /etc/fstab -e "s/\(.*\/boot.*\)defaults,ro\(.*\)/\1defaults\2/"
} }
@ -1960,19 +1968,20 @@ do_overlayfs() {
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
if enable_overlayfs; then if enable_overlayfs; then
STATUS="enabled" STATUS="enabled"
ASK_TO_REBOOT=1
else else
STATUS="unchanged" STATUS="unchanged"
fi fi
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
if disable_overlayfs; then if disable_overlayfs; then
STATUS="disabled" STATUS="disabled"
ASK_TO_REBOOT=1
else else
STATUS="unchanged" STATUS="unchanged"
fi fi
else else
return $RET return $RET
fi fi
ASK_TO_REBOOT=1
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "The overlay file system is $STATUS." 20 60 1 whiptail --msgbox "The overlay file system is $STATUS." 20 60 1
@ -2001,15 +2010,22 @@ do_overlayfs() {
fi fi
if [ $RET -eq $CURRENT ]; then if [ $RET -eq $CURRENT ]; then
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
enable_bootro if enable_bootro; then
STATUS="read-only" STATUS="read-only"
ASK_TO_REBOOT=1
else
STATUS="unchanged"
fi
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
disable_bootro if disable_bootro; then
STATUS="writable" STATUS="writable"
ASK_TO_REBOOT=1
else
STATUS="unchanged"
fi
else else
return $RET return $RET
fi fi
ASK_TO_REBOOT=1
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "The boot partition is $STATUS." 20 60 1 whiptail --msgbox "The boot partition is $STATUS." 20 60 1