From bf45df55426299e4b1883ba5871dc0d58c3c45d6 Mon Sep 17 00:00:00 2001 From: xSmurf Date: Mon, 5 Oct 2015 04:31:28 +0000 Subject: [PATCH] Better disable. --- board/coreboot/post_build.sh | 37 +++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/board/coreboot/post_build.sh b/board/coreboot/post_build.sh index d9e6f46..17758b1 100755 --- a/board/coreboot/post_build.sh +++ b/board/coreboot/post_build.sh @@ -13,34 +13,53 @@ error_exit() { # Copy the rootfs additions if [ -d "$BOARD_DIR/rootfs-additions" ]; then - echo "Copying rootfs additions ..." + echo "==> Copying rootfs additions ..." rsync -va $BOARD_DIR/rootfs-additions/* $TARGET_DIR/ error_exit $? else - echo "No rootfs additions found !" + echo "==> No rootfs additions found !" fi # Disable dropbear server if [ -e $TARGET_DIR/etc/init.d/S50dropbear ]; then - echo "Disabling dropbear server ..." - chmod a-x $TARGET_DIR/etc/init.d/S50dropbear - error_exit $? + echo -n "==> Disable Dropbear server: [Y/n] " + read DROPBEARSERVER + if [ "$DROPBEARSERVER" != "n" ]; then + echo "==> Disabling dropbear server ..." + #chmod a-x $TARGET_DIR/etc/init.d/S50dropbear + mkdir -p $TARGET_DIR/etc/init.disabled + mv -f $TARGET_DIR/etc/init.d/S50dropbear $TARGET_DIR/etc/init.disabled/ + error_exit $? + fi +fi + +# Disable gpe01 fix +if [ -e $TARGET_DIR/etc/init.d/S00gpefix ]; then + echo -n "==> Disable GPE01 fix: [y/N] " + read DISABLEGPEFIX + if [ "$DISABLEGPEFIX" = "y" ]; then + echo "==> Disabling gpe01 fix ..." + #chmod a-x $TARGET_DIR/etc/init.d/S00gpefix + mkdir -p $TARGET_DIR/etc/init.disabled + mv -f $TARGET_DIR/etc/init.d/S00gpefix $TARGET_DIR/etc/init.disabled/ + error_exit $? + fi fi # Enable virtual terminals in inittab if [ ! $(fgrep tty12 "$TARGET_DIR/etc/inittab") ]; then - echo "Enabling virtual terminal 2..12 ..." + echo "==> Enabling virtual terminal 2..12 ..." for ii in {12..2}; do sed -E -i 's/GENERIC_SERIAL/GENERIC_SERIAL\ntty'$ii'::askfirst:-\/bin\/login/' "$TARGET_DIR/etc/inittab" error_exit $? done else - echo "Virtual terminals already enabled." + echo "==> Virtual terminals already enabled." fi # Set pax flax (tentative) if [ -e "$TARGET_DIR/usr/lib/libcrypto.so.1.0.0" ]; then - echo "Setting paxflag on libcrypto ..." + echo "==> Setting paxflag on libcrypto ..." /sbin/paxctl -c $TARGET_DIR/usr/lib/libcrypto.so.1.0.0 error_exit $? /sbin/paxctl -m $TARGET_DIR/usr/lib/libcrypto.so.1.0.0 @@ -49,6 +68,6 @@ fi # Add symlink to gpg2 for convenience if [ ! -e "$TARGET_DIR/usr/bin/gpg" ]; then - echo "Symlinking gpg2 ..." + echo "==> Symlinking gpg2 ..." ln -s /usr/bin/gpg2 $TARGET_DIR/usr/bin/gpg fi