diff -x changelog -x '*~' -Nur user-setup-1.63ubuntu4/functions.sh user-setup-1.63ubuntu4+bsd1/functions.sh --- user-setup-1.63ubuntu4/functions.sh 2016-03-11 17:57:21.000000000 +0100 +++ user-setup-1.63ubuntu4+bsd1/functions.sh 2016-07-10 10:42:33.000000000 +0200 @@ -65,3 +65,5 @@ fi [ "$(printf %s "$1" | wc -c)" -lt 8 ] } + +os=$(uname -s) diff -x changelog -x '*~' -Nur user-setup-1.63ubuntu4/user-setup-apply user-setup-1.63ubuntu4+bsd1/user-setup-apply --- user-setup-1.63ubuntu4/user-setup-apply 2016-04-20 16:49:34.000000000 +0200 +++ user-setup-1.63ubuntu4+bsd1/user-setup-apply 2016-07-10 10:44:36.000000000 +0200 @@ -137,7 +137,7 @@ if [ "$OVERRIDE_ALREADY_ENCRYPTED_SWAP" ]; then ENCRYPT_HOME="true" ENCRYPT_HOME_OPT="--encrypt-home" - elif db_get user-setup/encrypt-home && [ "$RET" = true ]; then + elif [ ${os} = Linux ] && db_get user-setup/encrypt-home && [ "$RET" = true ]; then ENCRYPT_HOME="true" ENCRYPT_HOME_OPT="--encrypt-home" if type anna-install >/dev/null 2>&1 && [ -d /lib/debian-installer ]; then diff -x changelog -x '*~' -Nur user-setup-1.63ubuntu4/user-setup-ask user-setup-1.63ubuntu4+bsd1/user-setup-ask --- user-setup-1.63ubuntu4/user-setup-ask 2016-03-11 17:57:21.000000000 +0100 +++ user-setup-1.63ubuntu4+bsd1/user-setup-ask 2016-07-10 10:43:24.000000000 +0200 @@ -235,6 +235,7 @@ fi ;; 8) + if [ ${os} = Linux ] ; then db_get passwd/username USER="$RET" db_get passwd/make-user @@ -246,8 +247,10 @@ db_input high user-setup/encrypt-home || true fi fi + fi ;; 9) + if [ ${os} = Linux ] ; then ecryptfs_in_use= for homedir in "$ROOT/home"/*; do if [ -d "$homedir/.ecryptfs" ]; then @@ -266,6 +269,7 @@ continue fi fi + fi ;; *) break