Ajout support pour archives xz, et ajout fonction pour vérifier qu'on est bien l...

[hvlinux.git] / stage0 / pre-install

diff --git a/stage0/pre-install b/stage0/pre-install
index c891f37..15c38a8 100755 (executable)
--- a/stage0/pre-install
+++ b/stage0/pre-install
@@ -1,10 +1,7 @@
 #!/bin/bash
 set -o errexit
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
 # Making sure that this script was executed by the root user
 if [ "x${USER}" != "xroot" ]; then
@@ -22,7 +19,7 @@ fi
 # We cannot always automatically create the user 'lfs' because the installation
 # media can be a CD-ROM (read-only) If installing from some kind of live-CD,
 # simply install as root without the LFS user :)
-if ! grep "lfs" /etc/passwd 1> /dev/null 2>&1; then
+if ! grep -q "lfs" /etc/passwd; then
     groupadd -f lfs
     # The option '-k /dev/null' prevents possible copying of files from a
     # skeleton directory (default is /etc/skel).