Skip to content

Commit ce766a8

Browse files
committed
actually break out of package install prompt during expand
- disable dmesg during a handful of user input prompts
1 parent b324b1a commit ce766a8

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

scripts/InstallScripts/InstallPrawnOS.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ main() {
105105
echo "Expand or Install?: "
106106
echo "The currently booted device is ${BOOT_DEVICE_NO_P}"
107107
while true; do
108+
dmesg -D
108109
read -r -p "[I]nstall or [E]xpand?" IE
110+
dmesg -E
109111
case $IE in
110112
[Ii]* ) install; break;;
111113
[Ee]* ) expand; break;;
@@ -118,6 +120,7 @@ main() {
118120
#if target is usb, and boot device is usb, target is sdb
119121
#and whether to enable crypto
120122
install() {
123+
dmesg -D
121124
echo "Pick an install target. This can be the Internal Emmc, an SD card, or a USB device"
122125
echo "Please ensure you have only have the booted device and the desired target device inserted."
123126
echo "The currently booted device is ${BOOT_DEVICE_NO_P}"
@@ -130,6 +133,7 @@ install() {
130133
* ) echo "Please answer I, S, or U";;
131134
esac
132135
done
136+
dmesg -E
133137
if [[ $TARGET == "USB" ]]
134138
then
135139
if [[ $BOOT_DEVICE_NO_P == "/dev/sda" ]]
@@ -157,7 +161,9 @@ install() {
157161

158162
#Now on to the installation, basically copy InstallToInternal.sh
159163
while true; do
164+
dmesg -D
160165
read -r -p "This will ERASE ALL DATA ON ${TARGET_NO_P} and reboot when finished, do you want to continue? [y/N]" yn
166+
dmesg -E
161167
case $yn in
162168
[Yy]* ) break;;
163169
[Nn]* ) exit;;
@@ -232,7 +238,9 @@ install() {
232238
echo "${ROOT_PARTITION} / ext4 defaults,noatime 0 1" > $INSTALL_MOUNT/etc/fstab
233239

234240
while true; do
241+
dmesg -D
235242
read -r -p "Install a desktop environment and the supporting packages? [Y/n]" ins
243+
dmesg -E
236244
case $ins in
237245
[Yy]* ) install_packages $INSTALL_MOUNT; break;;
238246
[Nn]* ) break;;
@@ -353,10 +361,12 @@ expand() {
353361
resize2fs -f ${BOOT_DEVICE}2
354362
echo "/dev/${BOOT_DEVICE}2 / ext4 defaults,noatime 0 1" > /etc/fstab
355363
while true; do
364+
dmesg -D
356365
read -r -p "Install a desktop environment and the supporting packages? [Y/n]" ins
366+
dmesg -E
357367
case $ins in
358-
[Yy]* ) $SCRIPTS/InstallPackages.sh;;
359-
[Nn]* ) exit;;
368+
[Yy]* ) $SCRIPTS/InstallPackages.sh; break;;
369+
[Nn]* ) break;;
360370
* ) echo "Please answer y or n";;
361371
esac
362372
done

0 commit comments

Comments
 (0)