g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix whitespace and make dmesg "disable" level consistent

Browse Source
This commit is contained in:
SolidHal 2020-03-02 20:16:22 -06:00
parent c415b96d4a
commit 220a956c7d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/BuildResources/initramfs-init
View File

@ -76,7 +76,7 @@ fi
if [ -n "$(blkid ${ROOT_DEV}2 | grep crypto_LUKS)" ] if [ -n "$(blkid ${ROOT_DEV}2 | grep crypto_LUKS)" ]
then then
#decrypt and mount the root filesystem, disable kernel log messages to avoid clashing with the prompt #decrypt and mount the root filesystem, disable kernel log messages to avoid clashing with the prompt
dmesg -n 4 dmesg -n 2
echo "Opening encrypted root partition, this will take 30s..." echo "Opening encrypted root partition, this will take 30s..."
cryptsetup --tries 5 luksOpen ${ROOT_DEV}2 luksroot || rescue_shell cryptsetup --tries 5 luksOpen ${ROOT_DEV}2 luksroot || rescue_shell
dmesg -n 7 dmesg -n 7

4
scripts/InstallScripts/InstallPrawnOS.sh
View File

@ -123,12 +123,12 @@ install() {
# Since iteration count is based on cpu power, and the rk3288 isn't as fast as a usual # Since iteration count is based on cpu power, and the rk3288 isn't as fast as a usual
# desktop cpu, manually supply -i 15000 for security at the cost of a slightly slower unlock # desktop cpu, manually supply -i 15000 for security at the cost of a slightly slower unlock
dmesg -n 2 dmesg -n 2
echo "Enter the password you would like to use to unlock the encrypted root partition at boot" echo "Enter the password you would like to use to unlock the encrypted root partition at boot"
cryptsetup -q -y -s 512 luksFormat -i 15000 $ROOT_PARTITION || exit 1 cryptsetup -q -y -s 512 luksFormat -i 15000 $ROOT_PARTITION || exit 1
echo "Now unlock the newly created encrypted root partition so we can mount it and install the filesystem" echo "Now unlock the newly created encrypted root partition so we can mount it and install the filesystem"
cryptsetup luksOpen $ROOT_PARTITION luksroot || exit 1 cryptsetup luksOpen $ROOT_PARTITION luksroot || exit 1
dmesg -n 7 dmesg -n 7
ROOT_PARTITION=/dev/mapper/luksroot ROOT_PARTITION=/dev/mapper/luksroot
break break
;; ;;
No,*|*,No ) No,*|*,No )