fix setup-install fstab

1 files changed, 7 insertions, 9 deletions

diff --git a/core/scripts/setup-install.sh b/core/scripts/setup-install.sh
index ef1cb10..aca0115 100755
--- a/core/scripts/setup-install.sh
+++ b/core/scripts/setup-install.sh
@@ -173,7 +173,14 @@ setup_core() {
     #    %wheel ALL=(ALL) ALL"
 
     echo "1.2.5. File system table;"
+
     chroot $CHROOT /bin/bash -c "mount >> /etc/fstab"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "pkgmk   /usr/ports/work tmpfs size=30G,gid=$(id -g pkgmk),uid=$(id pkgmk),defaults,mode=0750 0    0 >> /etc/fstab"
+
     vim $CHROOT/etc/fstab
 
     echo "1.2.6. Initialization Scripts;"
@@ -212,15 +219,6 @@ setup_core() {
     chroot --userspec=pkgmk:pkgmk $CHROOT /bin/bash -c "mkdir /usr/ports/pkgbuild"
     chroot --userspec=pkgmk:pkgmk $CHROOT /bin/bash -c "mkdir /usr/ports/distfiles"
 
-    chroot $CHROOT /usr/bin/env -i \
-        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
-        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-        /bin/bash -c "id pkgmk >> /etc/fstab"
-
-    echo "pkgmk                                           /usr/ports/work tmpfs size=30G,gid=102,uid=101,defaults,mode=0750 0    0" >> $CHROOT/etc/fstab
-
-    vim $CHROOT/etc/fstab
-
     echo "1.3.3 Configure pkgmk;"
     #vim $CHROOT/etc/pkgmk.conf