cvsd commit: MODIFIED: . ...

[Commits of the cvsd project <cvsd-commits [at] lists.arthurdejong.org>]

User: arthur
Date: 11/10/05 22:11:00

Modified:    . cvsd-buildroot.in
Log:
patch by Eric Schnoebelen from NetBSD's pkgsrc


Revision  Changes    Path
1.56      +6 -2      cvsd/cvsd-buildroot.in

Index: cvsd-buildroot.in
===================================================================
RCS file: /home/arthur/devel/repos/cvsd/cvsd-buildroot.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- cvsd-buildroot.in   3 Jul 2011 20:37:46 -0000       1.55
+++ cvsd-buildroot.in   5 Oct 2011 20:11:00 -0000       1.56
@@ -64,6 +64,8 @@
 EXTRALIBS="$EXTRALIBS libnss_compat.so.2 libnss_files.so.2"
 # for OpenBSD:
 EXTRALIBS="$EXTRALIBS /usr/libexec/ld.so"
+# for NetBSD
+EXTRALIBS="$EXTRALIBS /usr/libexec/ld.elf_so /libexec/ld.elf_so"
 # for Solaris:
 EXTRALIBS="$EXTRALIBS /usr/lib/ld.so.1 nss_files.so.1"
 
@@ -376,14 +378,16 @@
   fi
 fi
 
-# for systems with strange password files (OpenBSD)
+# for systems with strange password files (OpenBSD/NetBSD/FreeBSD)
 if [ -r /etc/master.passwd ] && [ -r /etc/pwd.db ] && [ -x /usr/sbin/pwd_mkdb ]
 then
   echo $ECHO_N "making $ROOT/etc/pwd.db...$ECHO_C"
   # convert /etc/passwd to /etc/master.passwd
   sed 
's|\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\)|\1:\2:\3:\4::0:0:\5:\6:\7|'
 \
     < "$ROOT/etc/passwd" > "$ROOT/etc/master.passwd"
-  /usr/sbin/pwd_mkdb -p -d "$ROOT/etc" "$ROOT/etc/master.passwd"
+  # NetBSD expects -d to be the new root directory.
+  /usr/sbin/pwd_mkdb -p -d "$ROOT/etc" "$ROOT/etc/master.passwd" 2>/dev/null 
|| \
+  /usr/sbin/pwd_mkdb -p -d "$ROOT" "$ROOT/etc/master.passwd" 2>/dev/null
   echo "done."
 fi
 


-- 
To unsubscribe send an email to
cvsd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/cvsd-commits/