usbsecret-fix
This commit is contained in:
parent
f5e8fa792d
commit
897faaf920
3 changed files with 19 additions and 10 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -4,3 +4,4 @@ ArchLinuxARM-rpi-2-latest.tar.gz
|
|||
ArchLinuxARM-rpi-3-latest.tar.gz
|
||||
airootfs.sha512
|
||||
test
|
||||
arch.img
|
||||
|
|
|
@ -126,8 +126,8 @@ function usbkeyinstallation() {
|
|||
|
||||
function usbsecret() {
|
||||
|
||||
cp /opt/${repo}/install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret
|
||||
cp /opt/${repo}/hooks/usbsecret ${mountpoint}/root/usbsecret
|
||||
cp /opt/${repo}/install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret
|
||||
cp /opt/${repo}/hooks/usbsecret ${mountpoint}/root/usbsecret
|
||||
|
||||
# hooks
|
||||
#cp install/usbsecret ${mountpoint}/usr/lib/initcpio/install/usbsecret
|
||||
|
|
|
@ -1,14 +1,22 @@
|
|||
run_hook ()
|
||||
{
|
||||
msg ":: Suche USB-Stick nach entsperrung des Systems!"
|
||||
if blkid -s PARTUUID -o value | grep %USB_UUID% > /dev/null; then
|
||||
msg ":: USB-Stick gefunden fahre mit starten des Systems weiter!"
|
||||
else
|
||||
msg ":: USB-Stick konnte nicht zur entsperrung gefunden werden!"
|
||||
launch_interactive_shell
|
||||
fi
|
||||
# Do not need this thanks to tr: file=$(dos2unix inputs.txt)
|
||||
|
||||
msg ":: done."
|
||||
# Use -r so a line with backslashes will be showed like you want
|
||||
while true
|
||||
do
|
||||
# Not empty? Check with test -n
|
||||
if blkid -s PARTUUID -o value | grep %USB_UUID% > /dev/null; then
|
||||
echo ":: USB-Stick gefunden fahre mit starten des Systems weiter!"
|
||||
break
|
||||
else
|
||||
echo ":: USB-Stick konnte nicht zur entsperrung gefunden werden!"
|
||||
echo "..."
|
||||
sleep 5
|
||||
fi
|
||||
done
|
||||
|
||||
echo ":: done."
|
||||
}
|
||||
|
||||
# vim: set ft=sh ts=4 sw=4 et:
|
||||
|
|
Loading…
Reference in a new issue