Add dual support for real bash and busybox's bash(ash)

initrd/bin/cbfs-init

@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 set -e -o pipefail
 . /etc/functions
 

initrd/bin/cbfs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e -o pipefail
 . /etc/functions
 . /tmp/config

initrd/bin/config-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 set -e -o pipefail
 . /etc/functions

initrd/bin/flash-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 set -e -o pipefail
 . /etc/functions

initrd/bin/flash.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # based off of flashrom-x230
 #

initrd/bin/flashrom-kgpe-d16-openbmc.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 . /etc/functions
 
 ROM="$1"

initrd/bin/generic-init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Boot from a local disk installation
 
 . /etc/functions

initrd/bin/gpg-gui.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 set -e -o pipefail
 . /etc/functions

initrd/bin/gpgv

@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 # if we are using the full GPG we need a wrapper for the gpgv executable
 exec gpg --verify "$@"

initrd/bin/gui-init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Boot from a local disk installation
 
 BOARD_NAME=${CONFIG_BOARD_NAME:-${CONFIG_BOARD}} 

initrd/bin/kexec-boot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Launches kexec from saved configuration entries
 set -e -o pipefail
 . /tmp/config

initrd/bin/kexec-insert-key

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Unseal a disk key from TPM and add to a new initramfs
 set -e -o pipefail
 . /etc/functions

initrd/bin/kexec-iso-init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Boot from signed ISO
 set -e -o pipefail
 . /etc/functions

initrd/bin/kexec-parse-bls

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e -o pipefail
 bootdir="$1"
 file="$2"

initrd/bin/kexec-parse-boot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e -o pipefail
 bootdir="$1"
 file="$2"

initrd/bin/kexec-save-default

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Save these options to be the persistent default
 set -e -o pipefail
 . /tmp/config

initrd/bin/kexec-save-key

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generate a TPM key used to unlock LUKS disks
 set -e -o pipefail
 . /etc/functions

initrd/bin/kexec-seal-key

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This will generate a disk encryption key and seal / ecncrypt
 # with the current PCRs and then store it in the TPM NVRAM.
 # It will then need to be bundled into initrd that is booted.

initrd/bin/kexec-select-boot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generic configurable boot script via kexec
 set -e -o pipefail
 . /tmp/config

initrd/bin/kexec-sign-config

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Sign a valid directory of kexec params
 set -e -o pipefail
 . /tmp/config

initrd/bin/kexec-unseal-key

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # This will unseal and unecncrypt the drive encryption key from the TPM
 # The TOTP secret will be shown to the user on each encryption attempt.
 # It will then need to be bundled into initrd that is booted with Qubes.

initrd/bin/key-init

@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 set -e -o pipefail
 . /etc/functions
 

initrd/bin/media-scan

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Scan for USB installation options
 set -e -o pipefail
 . /etc/functions

initrd/bin/mount-usb

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Mount a USB device
 . /etc/functions
 

initrd/bin/network-init-recovery

@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 
 . /etc/functions
 

initrd/bin/oem-factory-reset

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Automated setup of TPM, GPG keys, and disk
 
 set -o pipefail

initrd/bin/oem-system-info-xx30

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # System Info
 
 BOARD_NAME=${CONFIG_BOARD_NAME:-${CONFIG_BOARD}} 

initrd/bin/poweroff

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Sync all mounted filesystems
 echo s > /proc/sysrq-trigger

initrd/bin/qubes-measure-luks

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Measure all of the luks disk encryption headers into
 # a PCR so that we can detect disk swap attacks.
 

initrd/bin/reboot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Sync all mounted filesystems
 echo s > /proc/sysrq-trigger

initrd/bin/seal-hotpkey

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Retrieve the sealed TOTP secret and initialize a USB Security dongle with it
 
 . /etc/functions

initrd/bin/seal-totp

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generate a random secret, seal it with the PCRs
 # and write it to the TPM NVRAM.
 #

initrd/bin/t430-flash.init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Initialize the USB and network device drivers,
 # invoke a recovery shell and prompt the user for how to proceed
 
@@ -23,4 +23,4 @@ echo '  mount -o ro /dev/sdb1 /media'
 echo '  flash.sh /media/t430.rom'
 echo ''
 
-exec /bin/ash
+exec /bin/bash

initrd/bin/tpm-reset

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 . /etc/functions
 
 if [ "$CONFIG_TPM" = "y" ]; then

initrd/bin/tpmr

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # TPM Wrapper - to unify tpm and tpm2 subcommands
 
 . /etc/functions

initrd/bin/uefi-init

@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 set -e -o pipefail
 . /etc/functions
 

initrd/bin/unseal-hotp

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Retrieve the sealed file and counter from the NVRAM, unseal it and compute the hotp
 
 . /etc/functions

initrd/bin/unseal-totp

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Retrieve the sealed file from the NVRAM, unseal it and compute the totp
 
 . /etc/functions

initrd/bin/usb-init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Boot a USB installation
 
 . /etc/functions

initrd/bin/wget-measure.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # get a file and extend a TPM PCR
 
 die() {

initrd/bin/x230-flash.init

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Initialize the USB and network device drivers,
 # invoke a recovery shell and prompt the user for how to proceed
 
@@ -23,4 +23,4 @@ echo '  mount -o ro /dev/sdb1 /media'
 echo '  flash.sh /media/x230.rom'
 echo ''
 
-exec /bin/ash
+exec /bin/bash

initrd/etc/functions

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Shell functions for most initialization scripts
 
 die() {
@@ -36,9 +36,9 @@ recovery() {
 		sleep 1
 
 		if [ -x /bin/setsid ]; then
-			/bin/setsid -c /bin/ash
+			/bin/setsid -c /bin/bash
 		else
-			/bin/ash
+			/bin/bash
 		fi
 	done
 }

initrd/etc/gui_functions

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Shell functions for common operations using fbwhiptail
 
 mount_usb()

initrd/etc/luks-functions

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Reencrypt LUKS container and change Disk Recovery Key associated passphrase (Slot 0: main slot)
 
 . /etc/functions

initrd/etc/passwd

@@ -1 +1 @@
-root:x:0:0:root:/:/bin/ash
+root:x:0:0:root:/:/bin/bash

initrd/init

@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 mknod /dev/ttyprintk c 5 3
 echo "hello world" > /dev/ttyprintk
 
@@ -30,12 +30,14 @@ if [ ! -r /dev/ptmx ]; then
 	ln -s /dev/pts/ptmx /dev/ptmx
 fi
 
-
-[ -a /dev/stdin ] || ln -s /proc/self/fd/0 /dev/stdin
-[ -a /dev/stdout ] || ln -s /proc/self/fd/1 /dev/stdout
-[ -a /dev/stderr ] || ln -s /proc/self/fd/2 /dev/stderr
 # Needed by bash
-[ -a /dev/fd ] || ln -s /proc/self/fd /dev/fd
+if ! [ -L /bin/bash ]; then
+	# /bin/bash is not a symbolink link (not busybox)
+	[ -a /dev/stdin ] || ln -s /proc/self/fd/0 /dev/stdin
+	[ -a /dev/stdout ] || ln -s /proc/self/fd/1 /dev/stdout
+	[ -a /dev/stderr ] || ln -s /proc/self/fd/2 /dev/stderr
+	[ -a /dev/fd ] || ln -s /proc/self/fd /dev/fd
+fi
 
 # Recovery shells will erase anything from here
 mkdir -p /tmp/secret
@@ -114,7 +116,7 @@ if [ "$boot_option" = "r" ]; then
 	if [ "$CONFIG_TPM" = "y" -o "$CONFIG_TPM2_TOOLS" = "y" ]; then
 		tpmr extend -ix 4 -ic recovery
 	fi
-	exec /bin/ash
+	exec /bin/bash
 	exit
 fi
 
@@ -171,4 +173,4 @@ fi
 if [ "$CONFIG_TPM" = "y" -o "$CONFIG_TPM2_TOOLS" = y ]; then
 	tpmr extend -ix 4 -ic recovery
 fi
-exec /bin/ash
+exec /bin/bash

initrd/mount-boot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Extract the GPG signed dmsetup configuration from
 # the header of the file system, validate it against
 # the trusted key database, and execute it to mount

initrd/sbin/config-dhcp.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # udhcpc script
 

initrd/sbin/insmod

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # extend a TPM PCR with a module and then load it
 # any arguments will also be measured.
 # The default PCR to be extended is 5, but can be