summaryrefslogtreecommitdiffstats
path: root/move
diff options
context:
space:
mode:
Diffstat (limited to 'move')
-rw-r--r--move/data/keyfiles1
-rwxr-xr-xmove/make_live5
-rw-r--r--move/move.pm3
3 files changed, 8 insertions, 1 deletions
diff --git a/move/data/keyfiles b/move/data/keyfiles
index a4b8677bf..230e5f788 100644
--- a/move/data/keyfiles
+++ b/move/data/keyfiles
@@ -4,7 +4,6 @@
/etc/modules.conf
/etc/passwd
/etc/resolv.conf
-/etc/shadow
/etc/sudoers
/etc/cups/classes.conf
/etc/cups/client.conf
diff --git a/move/make_live b/move/make_live
index 734155ce4..4cb5a729c 100755
--- a/move/make_live
+++ b/move/make_live
@@ -80,3 +80,8 @@ substInFile {
#- /lib is ro, for the moment we don't save, we'll see later if we may want to save (using /var/dev-state for example)
s|.*lib/dev-state.*||;
} "$::prefix/etc/devfsd.conf";
+
+substInFile {
+ #- don't use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key
+ s|\s*shadow||;
+} "$::prefix/etc/pam.d/system-auth";
diff --git a/move/move.pm b/move/move.pm
index 597dbabcb..589bf996f 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -116,6 +116,9 @@ drakx_stuff:
$o->{orderedSteps} = [ qw(selectLanguage handleI18NClp acceptLicense verifyKey selectMouse selectKeyboard startMove) ];
$o->{steps}{first} = $o->{orderedSteps}[0];
+ #- don't use shadow passwords since pwconv overwrites /etc/shadow hence contents will be lost for usb key
+ delete $o->{authentication}{shadow};
+
member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs;
}