hammer.sh: Sync with some of the recent installer changes.

* Use disklabel64(8).

* Do the 'chflags nohistory ...' after the cpdups to not have cpdup
  overwrite the flags again.

diff --git a/share/examples/rconfig/hammer.sh b/share/examples/rconfig/hammer.sh
index 74ee03c..f30ea90 100644 (file)
--- a/share/examples/rconfig/hammer.sh
+++ b/share/examples/rconfig/hammer.sh
@@ -55,15 +55,15 @@ set echo
 #
 dd if=/dev/zero of=/dev/${disk} bs=32k count=16
 fdisk -IB ${disk}
-disklabel -r -w ${disk}s1 auto
-disklabel -B ${disk}s1
-disklabel ${disk}s1 > /tmp/label
+disklabel64 -r -w ${disk}s1 auto
+disklabel64 -B ${disk}s1
+disklabel64 ${disk}s1 > /tmp/label
 cat >> /tmp/label << EOF
-  a: 256m 32 4.2BSD
+  a: 256m 0 4.2BSD
   b: 2g * swap
   d: * * HAMMER
 EOF
-disklabel -R ${disk}s1 /tmp/label
+disklabel64 -R ${disk}s1 /tmp/label
 
 newfs /dev/${disk}s1a
 newfs_hammer -L ROOT /dev/${disk}s1d
@@ -109,11 +109,6 @@ mount_null /mnt/pfs/usr.obj /mnt/usr/obj
 chmod 1777 /mnt/tmp
 chmod 1777 /mnt/var/tmp
 
-chflags nohistory /mnt/tmp
-chflags nohistory /mnt/var/tmp
-chflags nohistory /mnt/var/crash
-chflags nohistory /mnt/usr/obj
-
 # Install the system from the live CD
 #
 cpdup -o / /mnt
@@ -123,6 +118,11 @@ cpdup -o /var /mnt/var
 cpdup -o /dev /mnt/dev
 cpdup -i0 /etc.hdd /mnt/etc
 
+chflags -R nohistory /mnt/tmp
+chflags -R nohistory /mnt/var/tmp
+chflags -R nohistory /mnt/var/crash
+chflags -R nohistory /mnt/usr/obj
+
 # Create some directories to be used for NFS mounts later on.
 # Edit as desired.
 #