From 11dc6c20bc6c2f650eff0fd7654f674376e3ee50 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 5 Mar 2018 23:32:20 +0000 Subject: Use default_user setting in drakx-finish-install after live install. --- config/build.cfg | 2 +- files/draklive-install.d/finish-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/build.cfg b/config/build.cfg index a00ab83..1500e0a 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -279,7 +279,7 @@ my $_l = { # Set default user name for draklive-install. "echo $default_user > /etc/draklive-install.d/user", - "perl -pi -e 's,,$default_user,' /etc/draklive-install.d/sysconfig/finish-install", + "sed -i s/DEFAULT_USER/$default_user/ /etc/draklive-install.d/sysconfig/finish-install", # Allow draklive-install to spawn subtasks that access the display. "echo 'session optional pam_xauth.so # for draklive-install' >> /etc/pam.d/polkit-1", diff --git a/files/draklive-install.d/finish-install b/files/draklive-install.d/finish-install index ba93dd9..28fe550 100644 --- a/files/draklive-install.d/finish-install +++ b/files/draklive-install.d/finish-install @@ -8,6 +8,6 @@ NETWORK=yes URPMI=yes AUTHENTICATION=no USERS=with_root -USER_RENAME_FROM=live +USER_RENAME_FROM=DEFAULT_USER USER_AUTOLOGIN_FIRST=no GLX=no -- cgit v1.2.1