From ba528b24b8c60ed77ee7f33f2ce42ed7ebc5e5f3 Mon Sep 17 00:00:00 2001 From: Pablo Castellano Date: Wed, 19 Jul 2017 20:05:34 +0200 Subject: [PATCH] Two trivial changes (typo + info message) (#179) Thanks, Pablo Castellano! * Fixed typo * Guide user about what are the next steps after flashing kernel and password * Increased postmarketos-mkinitfs' pkgver and rewording Changes requested: https://github.com/postmarketOS/pmbootstrap/pull/179 --- postmarketos-mkinitfs/10-usb-unlock.sh | 1 + postmarketos-mkinitfs/APKBUILD | 6 +++--- postmarketos-mkinitfs/init_functions.sh | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/postmarketos-mkinitfs/10-usb-unlock.sh b/postmarketos-mkinitfs/10-usb-unlock.sh index 131538932..31a1fc8c1 100644 --- a/postmarketos-mkinitfs/10-usb-unlock.sh +++ b/postmarketos-mkinitfs/10-usb-unlock.sh @@ -19,6 +19,7 @@ start_usb_unlock() { echo '#!/bin/sh' echo '. /init_functions.sh' echo 'unlock_root_partition' + echo 'echo_connect_ssh_message' echo 'killall cryptsetup telnetd' } >/telnet_connect.sh chmod +x /telnet_connect.sh diff --git a/postmarketos-mkinitfs/APKBUILD b/postmarketos-mkinitfs/APKBUILD index 58a5b565f..3675d672a 100644 --- a/postmarketos-mkinitfs/APKBUILD +++ b/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.1.5 +pkgver=0.1.6 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://github.com/postmarketOS" @@ -28,8 +28,8 @@ package() { "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } sha512sums="22418d8869448b456a775f03b18d7b4e13f3cac1129233ced42caf67c3aea4abcc6488fcba2acb5e20dd72f2a6da6419938ac44751a5ba175f02eab586573c43 init.sh.in -7f72b71efb3d4e4d09b4311c019ee39477bb9dcb1098f0a34d4a5e28d69661fac4ab6eb4d2d4585ce9a4ba6d772173df36686565944d53bd7cc80d87a0b4b551 init_functions.sh +6d130be59507ad6c755ce8dfe345335e54b3891ca484e7865246ce69fe9d4e6441247acf6d17cc2ff414aaa0aca13fc28c8956b90f1626b784429adc3b5bf866 init_functions.sh 3026c45c14ae6d83e28e322c46b151e962493587d7ea9bdf3acfbf6c859d405800b0e3fcf2b509f06f26d5af625951a1bedff1ed7fda0eeaddcb46dc2d39dc13 mkinitfs.sh -81d001ab185a8db1b9335d7c8c278d49ab0446bc15bb00dd22e4de16633433a183888f3f1096399bfe361ed719dcc4203afdf4b4f10e74a9c1e50bbbfc46951c 10-usb-unlock.sh +8129300894f0b91ba669c12df2e51fb8dd9a9366da26496523047782026714444f40037b88d3e56dc28e3049901c32bf2a4959390883dfbbff8cfa19bb82045f 10-usb-unlock.sh 35a8eabad947347afec7e3f5860d31ab9e3534972c0960ccf553c7e1cc9262316bfdddb8d61d3588db1ee2261077597617806080b9956798b3e5088d6f9b596b splash1.ppm.gz bf11d8b3a50db984cfbb2cafe6687de327242c1f6f56c6fdd02ca579b05213f9c886aa1c0527530fdec21b16e65e68962e40a600c4ce155819df2f610b435087 splash2.ppm.gz" diff --git a/postmarketos-mkinitfs/init_functions.sh b/postmarketos-mkinitfs/init_functions.sh index 8e180fc62..e1f20a33e 100644 --- a/postmarketos-mkinitfs/init_functions.sh +++ b/postmarketos-mkinitfs/init_functions.sh @@ -188,3 +188,9 @@ show_splash() { gzip -c -d "$1" >/tmp/splash.ppm fbsplash -s /tmp/splash.ppm } + +echo_connect_ssh_message() { + echo "Your root partition has been decrypted successfully!" + echo "You can connect to your device using SSH in a few seconds:" + echo "ssh user@$IP" +}