diff --git a/README.md b/README.md index 251f6b1..e382c75 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Download TWRP: `./download-twrp.py $device` Install a halium rootfs and systemimage: -`halium-install -p ` +`halium-install -p ` Connect to the device: `./connect.py -p $protocol -u $username` diff --git a/functions/distributions.sh b/functions/distributions.sh index 41530b7..db143d6 100644 --- a/functions/distributions.sh +++ b/functions/distributions.sh @@ -12,7 +12,7 @@ halium | reference) pm | neon | debian-pm | debian-pm-caf) IMAGE_SIZE=4G ;; -ut | ut20.04) +ut*) IMAGE_SIZE=3G ;; none) @@ -140,9 +140,9 @@ function post_install() { # set static path for now chroot_run "dpkg-reconfigure openssh-server" ;; - ut | ut20.04) + ut*) echo -n "enabling SSH ... " - if [ "$1" = ut ]; then + if [ "$1" = "ut16.04" ]; then sudo sed -i 's/PasswordAuthentication=no/PasswordAuthentication=yes/g' "$ROOTFS_DIR/etc/init/ssh.override" sudo sed -i 's/manual/start on startup/g' "$ROOTFS_DIR/etc/init/ssh.override" sudo sed -i 's/manual/start on startup/g' "$ROOTFS_DIR/etc/init/usb-tethering.conf" diff --git a/functions/misc.sh b/functions/misc.sh index 86353e4..b552c0e 100755 --- a/functions/misc.sh +++ b/functions/misc.sh @@ -38,7 +38,7 @@ function usage() { Options: -p POSTINSTALL run common post installation tasks for release. - supported: reference, neon, ut, ut20.04, debian-pm, debian-pm-caf, none + supported: reference, neon, ut16.04, ut20.04, debian-pm, debian-pm-caf, none default: none -v verbose output. diff --git a/halium-install b/halium-install index 8b424ca..27d757a 100755 --- a/halium-install +++ b/halium-install @@ -41,7 +41,11 @@ while [ -n "$1" ] ; do shift export ROOTFS_RELEASE="$1" case $ROOTFS_RELEASE in - "halium" | "debian-pm" | "reference" | "debian-pm-caf" | "pm" | "neon" | "ut" | "ut20.04" | "none") + "halium" | "debian-pm" | "reference" | "debian-pm-caf" | "pm" | "neon" | "ut16.04" | "ut20.04" | "none") + ;; + "ut") + echo "Please specify the Ubuntu Touch version after 'ut', for example 'ut20.04'" + exit 1 ;; *) echo "Unsupported post install release! Exiting now"