Fix udev naming of eth* network interfaces

[hvlinux.git] / stage2 / pkg / shadow

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
index ec70165..a8314a9 100644 (file)
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -2,10 +2,8 @@
 
 hvconfig_pre()
 {
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --without-selinux"
-    
+    CONFIGURE_OPTS+=" --without-selinux"
+
     cd ${LFS_TMP}/${PACKAGE}
 
     # Disable the installation of the groups program and its man page, as
@@ -13,15 +11,11 @@ hvconfig_pre()
     sed -i 's/groups$(EXEEXT) //' src/Makefile.in
     find man -name Makefile.in -exec sed -i 's/groups\.1 / /' {} \;
 
-    # Disable the installation of Chinese and Korean manual pages, since Man-DB
-    # cannot format them properly:
-    sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile.in
-
-    # Instead of using the default crypt method, use the more secure MD5 method
+    # Instead of using the default crypt method, use the more secure SHA-512 method
     # of password encryption, which also allows passwords longer than 8 characters.
     # It is also necessary to change the obsolete /var/spool/mail location for user
     # mailboxes that Shadow uses by default to the /var/mail location used currently:
-    sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD MD5@' \
+    sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
         -e 's@/var/spool/mail@/var/mail@' etc/login.defs
 }