[Pkg-uml-commit] r304 - in trunk/src/rootstrap: debian modules

[malattia at alioth.debian.org]

Author: malattia
Date: 2007-12-30 07:38:26 +0000 (Sun, 30 Dec 2007)
New Revision: 304

Modified:
   trunk/src/rootstrap/debian/changelog
   trunk/src/rootstrap/modules/uml
Log:
* handle the case where no /etc/timezone exists and just copy /etc/localtime
  instead (Closes: #446795)
* use /sbin/MAKEDEV as the link from /dev/ is not provided anymore
  (Closes: #446729)



Modified: trunk/src/rootstrap/debian/changelog
===================================================================
--- trunk/src/rootstrap/debian/changelog	2007-12-24 12:04:26 UTC (rev 303)
+++ trunk/src/rootstrap/debian/changelog	2007-12-30 07:38:26 UTC (rev 304)
@@ -1,3 +1,12 @@
+rootstrap (0.3.24-4) unstable; urgency=low
+
+  * handle the case where no /etc/timezone exists and just copy /etc/localtime
+    instead (Closes: #446795)
+  * use /sbin/MAKEDEV as the link from /dev/ is not provided anymore
+    (Closes: #446729)
+
+ -- Mattia Dongili <malattia at debian.org>  Sun, 30 Dec 2007 16:34:41 +0900
+
 rootstrap (0.3.24-3) unstable; urgency=low
 
   * build also on amd64

Modified: trunk/src/rootstrap/modules/uml
===================================================================
--- trunk/src/rootstrap/modules/uml	2007-12-24 12:04:26 UTC (rev 303)
+++ trunk/src/rootstrap/modules/uml	2007-12-30 07:38:26 UTC (rev 304)
@@ -1,11 +1,11 @@
 #!/bin/sh -e
-
+set -x
 # create device nodes.
 chroot $TARGET mount -t proc proc /proc
 for i in 1 2 3 4 5 6 7 8; do
 	NEW_TTY="$NEW_TTY tty$i"
 done
-chroot $TARGET /bin/sh -c "cd /dev && ./MAKEDEV ubd std pty $NEW_TTY"
+chroot $TARGET /bin/sh -c "cd /dev && /sbin/MAKEDEV ubd std pty $NEW_TTY"
 chroot $TARGET umount /proc
 
 # generate a new fstab
@@ -16,11 +16,13 @@
 EOF
 
 # setup the timezone, the same as the host
-[ ! -e $HOST/etc/timezone ] || TARGET_TIMEZONE="$(cat $HOST/etc/timezone)"
+[ ! -f $HOST/etc/timezone ] || TARGET_TIMEZONE="$(cat $HOST/etc/timezone)"
 
-if [ -e "$TARGET/usr/share/zoneinfo/$TARGET_TIMEZONE" ] ; then
+if [ -f "$TARGET/usr/share/zoneinfo/$TARGET_TIMEZONE" ] ; then
 	chroot $TARGET cp /usr/share/zoneinfo/$TARGET_TIMEZONE /etc/localtime
 	echo "$TARGET_TIMEZONE" > $TARGET/etc/timezone
+elif [ -f "$HOST/etc/localtime" ] ; then
+	cp $HOST/etc/localtime $TARGET/etc/localtime
 fi 
 
 # kernel modules