Start fresh with the original utility scripts from the X230 release

util/functions.sh

@@ -57,3 +57,11 @@ warn_not_root() {
 		echo -e "${YELLOW}WARNING:${NC} This should not be executed as root!"
 	fi
 }
+
+poweroff() {
+    if command -v systemctl 2>/dev/null; then
+        systemctl poweroff
+    else
+        shutdown -P now
+    fi
+}

x230/x230_heads.sh

@@ -155,8 +155,8 @@ rm -rf ${OUTPUT_PATH}
 while true; do
 	read -r -p "Power off now? (please do!) Y/n: " yn
 	case $yn in
-		[Yy]* ) systemctl poweroff ;;
+		[Yy]* ) poweroff ;;
 		[Nn]* ) exit;;
-		* ) systemctl poweroff ;;
+		* ) poweroff ;;
 	esac
 done

x230/x230_skulls.sh

@@ -217,8 +217,8 @@ rm -rf ${OUTPUT_PATH}
 while true; do
 	read -r -p "Power off now? (please do!) Y/n: " yn
 	case $yn in
-		[Yy]* ) systemctl poweroff ;;
+		[Yy]* ) poweroff ;;
 		[Nn]* ) exit;;
-		* ) systemctl poweroff ;;
+		* ) poweroff ;;
 	esac
 done

x230t/build.sh

@@ -7,7 +7,7 @@ have_config=0
 
 usage()
 {
-	echo "Skulls for the X230 Tablet"
+	echo "Skulls for the X230"
 	echo "  Run this script to rebuild a released image"
 	echo ""
 	echo "Usage: $0 [-c <config_file>]"
@@ -77,5 +77,5 @@ CONFIGFILE_READY=$(echo $CONFIGFILE | cut -d'-' -f2-)
 cp $CONFIGFILE $CONFIGFILE_READY
 
 cd ..
-./build.sh --clean-slate --commit $(ls -1 x230t/defconfig-* |  cut -d'-' -f2-) x230t
-rm -f x230t/defconfig-*
+./build.sh --clean-slate --commit $(ls -1 x230/defconfig-* |  cut -d'-' -f2-) x230
+rm -f x230/defconfig-*

x230t/compile.sh

@@ -11,7 +11,7 @@ source /home/coreboot/common_scripts/config_and_make.sh
 ## MODEL VARIABLES
 ################################################################################
 MAINBOARD="lenovo"
-MODEL="x230t"
+MODEL="x230"
 
 ################################################################################
 

x230t/external_install_bottom.sh

@@ -20,9 +20,9 @@ rpi_frequency=0
 
 usage()
 {
-	echo "Skulls for the X230 Tablet"
+	echo "Skulls for the X230"
 	echo "  Run this script on an external computer with a flasher"
-	echo "  connected to the X230T's bottom chip (farther away from"
+	echo "  connected to the X230's bottom chip (farther away from"
 	echo "  the display, closer to you)."
 	echo ""
 	echo "Usage: $0 [-m] [-k <backup_filename>] [-l] [-f <flasher>] [-b <spispeed>] [-c <chip>]"
@@ -92,7 +92,7 @@ command -v make >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install make and
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
 if [ ! "$have_flasher" -gt 0 ] ; then
-	echo "Skulls for the X230 Tablet"
+	echo "Skulls for the X230"
 	echo ""
 	echo "Please select the hardware you use:"
 	PS3='Please select the hardware flasher: '

x230t/external_install_top.sh

@@ -15,9 +15,9 @@ rpi_frequency=0
 
 usage()
 {
-	echo "Skulls for the X230 Tablet"
+	echo "Skulls for the X230"
 	echo "  Run this script on an external computer with a flasher"
-	echo "  connected to the X230T's top chip (closer to the display"
+	echo "  connected to the X230's top chip (closer to the display"
 	echo "  and farther from you)"
 	echo ""
 	echo "Usage: $0 [-i <image.rom>] [-c <chipname>] [-k <backup_filename>] [-f <flasher>] [-b <spispeed>]"
@@ -83,7 +83,7 @@ command -v flashrom >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install flash
 command -v mktemp >/dev/null 2>&1 || { echo -e >&2 "${RED}Please install mktemp (coreutils)${NC}."; exit 1; }
 
 if [ ! "$have_input_image" -gt 0 ] ; then
-	image_available=$(ls -1 | grep x230t_coreboot_seabios || true)
+	image_available=$(ls -1 | grep x230_coreboot_seabios || true)
 	if [ -z "${image_available}" ] ; then
 		echo "No image file found. Please add -i <file>"
 		echo ""

x230t/x230_heads.sh

@@ -155,8 +155,8 @@ rm -rf ${OUTPUT_PATH}
 while true; do
 	read -r -p "Power off now? (please do!) Y/n: " yn
 	case $yn in
-		[Yy]* ) systemctl poweroff ;;
+		[Yy]* ) poweroff ;;
 		[Nn]* ) exit;;
-		* ) systemctl poweroff ;;
+		* ) poweroff ;;
 	esac
 done

x230t/x230_skulls.sh

@@ -14,8 +14,8 @@ verbose=0
 
 usage()
 {
-	echo "Skulls for the X230 Tablet"
-	echo "  Run this script on the X230 Tablet directly."
+	echo "Skulls for the X230"
+	echo "  Run this script on the X230 directly."
 	echo ""
 	echo "  This flashes the BIOS with the given image."
 	echo "  Make sure you booted Linux with iomem=relaxed"
@@ -217,8 +217,8 @@ rm -rf ${OUTPUT_PATH}
 while true; do
 	read -r -p "Power off now? (please do!) Y/n: " yn
 	case $yn in
-		[Yy]* ) systemctl poweroff ;;
+		[Yy]* ) poweroff ;;
 		[Nn]* ) exit;;
-		* ) systemctl poweroff ;;
+		* ) poweroff ;;
 	esac
 done