core revision

6 files changed, 306 insertions, 266 deletions

diff --git a/core/scripts/configure.sh b/core/scripts/configure.sh
deleted file mode 100644
index f279725..0000000
--- a/core/scripts/configure.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-ADMIN_USER=c9admin
-CHROOT=/mnt
-#ADMIN_PASS=
-
-DIR=$(dirname "$PWD");
-DIR_CONF=$DIR"/conf"
-
-printf "CHROOT="$CHROOT"\n";
-printf "DIR="$DIR"\n";
-printf "DIR_CONF="$DIR_CONF"\n";
-printf "ADMIN_USER="$ADMIN_USER"\n"
-read PAUSE
-
-
-#configure_crux() {
-
-    echo "1.2.1. Set hostname and hosts;"
-    cp $DIR_CONF/hosts $CHROOT/etc/
-    vim $CHROOT/etc/hosts
-
-    echo "1.2.2. Set timezone;"
-    chroot $CHROOT /bin/bash -c tzselect
-
-    echo "1.2.3. Set locale;"
-    chroot $CHROOT /bin/bash -c "localedef -i en_US -f UTF-8 en_US.UTF-8"
-
-    echo "1.2.4.2. Create Administrator $ADMIN_USER;"
-
-    chroot $CHROOT /usr/bin/env -i \
-        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
-        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-        /bin/bash -c "useradd -U -m -k /etc/skel -s /bin/bash $ADMIN_USER"
-
-#    echo "$ADMIN_USER:$ADMIN_PASS" >$CHROOT/root/foo
-#    chroot $CHROOT 'chpasswd </root/foo'
-#    rm $CHROOT/root/foo
-#
-    echo "1.2.4.3. Add Administrator $ADMIN_USER to wheel group;"
-    chroot $CHROOT /bin/bash -c "usermod -a -G wheel $ADMIN_USER"
-    echo "1.2.4.3. Uncomment to allow members of group wheel to execute any command\n
-#    %wheel ALL=(ALL) ALL"
-     cp $DIR_CONF/sudoers $CHROOT/etc/
-
-    echo "1.2.5. File system table;"
-    cp $DIR_CONF/fstab $CHROOT/etc/
-    blkid >> $CHROOT/etc/fstab
-    vim $CHROOT/etc/fstab
-
-    echo "1.2.6. Initialization Scripts;"
-    cp $DIR_CONF/rc.conf $CHROOT/etc/
-    vim $CHROOT/etc/rc.conf
-
-#}
-
-printf "Chroot to /mnt and set root and admin password:\n"
diff --git a/core/scripts/getiso.sh b/core/scripts/getiso.sh
deleted file mode 100644
index 18f1ad1..0000000
--- a/core/scripts/getiso.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-ISO_URL="https://serverop.de/crux/crux-3.2/iso/crux-3.2.iso"
-ISO_FILE="crux-3.2.iso"
-
-printf "1.1.1 Path/to crux-3.2.iso (/home/user/Downloads):"
-read ISO_PATH
-
-
-#prepare_iso() {
-
-    ISO_FILE=$ISO_PATH/$ISO_FILE
-
-    if [ -f $ISO_FILE ];
-    then
-        echo "File $ISO_FILE exists."
-    else
-        echo "File $ISO_FILE does not exist."
-        cd $ISO_PATH && { curl -k -O $ISO_URL ; cd -; }
-    fi
-
-#}
-
-modprobe isofs
-modprobe loop
-mount -o loop $ISO_FILE $CHROOT/media
diff --git a/core/scripts/ports.sh b/core/scripts/ports.sh
deleted file mode 100644
index a9cd901..0000000
--- a/core/scripts/ports.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-ADMIN_USER=c9admin
-CHROOT=/mnt
-
-DIR=$(dirname "$PWD");
-DIR_CONF=$DIR"/conf"
-
-printf "CHROOT="$CHROOT"\n";
-printf "DIR_CONF="$DIR_CONF"\n";
-
-echo "1.3.1. Build as unprivileged user;"
-
-chroot $CHROOT /bin/bash -c "useradd -U -m -d /usr/ports -s /bin/false pkgmk"
-chroot $CHROOT /bin/bash -c "usermod -a -G pkgmk $ADMIN_USER"
-chroot $CHROOT /bin/bash -c "chown -R root:pkgmk /usr/ports"
-chroot $CHROOT /bin/bash -c "chmod -R 774 /usr/ports"
-chroot $CHROOT /bin/bash -c "chmod 775 /usr/ports"
-
-echo "1.3.2. Ports Layout;"
-
-chroot --userspec=pkgmk:pkgmk $CHROOT /bin/bash -c "mkdir /usr/ports/packages"
-chroot --userspec=pkgmk:pkgmk $CHROOT /bin/bash -c "mkdir /usr/ports/work"
-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 /bin/bash -c "id pkgmk"
-read PAUSE
-vim $CHROOT/etc/fstab
-
-echo "1.3.3 Configure pkgmk;"
-cp $DIR_CONF/pkgmk.conf $CHROOT/etc/
-#vim $CHROOT/etc/pkgmk.conf
-
-echo "1.3.4 Configure prt-get;"
-mv $CHROOT/etc/ports/contrib.rsync.inactive $CHROOT/etc/ports/contrib.rsync
-cp $DIR_CONF/prt-get.conf $CHROOT/etc/
-#vim $CHROOT/etc/prt-get.conf
diff --git a/core/scripts/setup-install.sh b/core/scripts/setup-install.sh
index 553aee0..7625519 100644
--- a/core/scripts/setup-install.sh
+++ b/core/scripts/setup-install.sh
@@ -1,5 +1,34 @@
 #!/bin/sh
 
+# Set Global Vars
+ADMIN_USER=c9admin
+DEV=$1
+CHROOT="/mnt"
+##read BLK_SWP
+BLK_SWP="/dev/sda9"
+
+##read BLK_EFI
+BLK_EFI="${DEV}1"
+##read BLK_BOOT
+BLK_BOOT="${DEV}2"
+##read BLK_ROOT
+BLK_ROOT="${DEV}3"
+##read BLK_VAR
+BLK_VAR="${DEV}4"
+
+# Absolute path to this script, e.g. /home/user/bin/foo.sh
+SCRIPT=$(readlink -f "$0")
+# Absolute path this script is in, thus /home/user/bin
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+DIR=$(dirname "$SCRIPTPATH");
+DIR_LOCAL="$(dirname $(dirname ${DIR}))/local";
+
+DIR_CONF="${DIR}/conf"
+DIR_PRT="${DIR}/ports";
+
+ISO_FILE="${DIR_LOCAL}/crux-3.2.iso"
+
 # First we define the function
 ConfirmOrExit ()
 {
@@ -19,26 +48,227 @@ ConfirmOrExit ()
     echo "You entered $CONFIRM. Continuing ..."
 }
 
-# Set Global Vars
-DEV=$1
-CHROOT="/mnt"
-##read BLK_SWP
-BLK_SWP="/dev/sda9"
+setup_target () {
+    echo "1.1.2 Creating File System on $BLK_EFI with fat32:"
+    mkfs.fat -F 32 $BLK_EFI
+    echo "1.1.2 Creating File System on $BLK_BOOT with ext4:"
+    mkfs.ext4 $BLK_BOOT
+    echo "1.1.2 Creating File System on $BLK_ROOT with ext4:"
+    mkfs.ext4 $BLK_ROOT
+    echo "1.1.2 Creating File System on $BLK_VAR with ext4:"
+    mkfs.ext4 $BLK_VAR
+    #echo "1.1.2 Creating Swap File System on $BLK_SWP:"
+    #mkswap $BLK_SWP
+
+    echo "1.1.3 mount point to chroot (/mnt):\n"
+    mount $BLK_ROOT $CHROOT
+
+    mkdir -p $CHROOT/boot
+    mount $BLK_BOOT $CHROOT/boot
+    mkdir -p $CHROOT/boot/efi
+    mount $BLK_EFI $CHROOT/boot/efi
+    mkdir -p $CHROOT/var
+    mount $BLK_VAR $CHROOT/var
+
+    mkdir -p $CHROOT/dev
+    mkdir -p $CHROOT/tmp
+    mkdir -p $CHROOT/proc
+    mkdir -p $CHROOT/sys
+
+    mkdir -p $CHROOT/var/lib/pkg
+    mkdir -p $CHROOT/usr/ports
+
+    mkdir -p $CHROOT/media
+    mkdir -p $CHROOT/home
+
+    mount --bind /dev $CHROOT/dev
+    mount -vt devpts devpts $CHROOT/dev/pts
+    mount -vt tmpfs shm $CHROOT/dev/shm
+    mount -vt proc proc $CHROOT/proc
+    mount -vt sysfs sysfs $CHROOT/sys
+
+    modprobe isofs
+    modprobe loop
+    mount -o loop $ISO_FILE $CHROOT/media
+}
 
-##read BLK_EFI
-BLK_EFI="${DEV}1"
-##read BLK_BOOT
-BLK_BOOT="${DEV}2"
-##read BLK_ROOT
-BLK_ROOT="${DEV}3"
-##read BLK_VAR
-BLK_VAR="${DEV}4"
+setup_bin() {
+
+    echo "1.1.4 Create core.lst and install pkgadd"
+    for p in $CHROOT/media/crux/core/*; do echo $p >> $CHROOT/core.lst; done
+
+    tar xf "$CHROOT/media/crux/core/pkgutils#5.36-2.pkg.tar.xz" usr/bin/pkgadd -O > $CHROOT/pkgadd
+
+    chmod +x $CHROOT/pkgadd
+
+    echo "1.1.4 File core.lst complete, review list of packages before continue..."
+    read PAUSE
+    vim $CHROOT/core.lst
+
+    echo "1.1.4 Starting install"
+    touch $CHROOT/var/lib/pkg/db
+
+    cd $CHROOT
+    while read line; do
+        echo "Installing $line;\n"
+        $CHROOT/pkgadd -f -r $CHROOT $line
+    done < core.lst
+
+    rm $CHROOT/pkgadd
+    rm $CHROOT/core.lst
+
+    echo "1.1.5. Install extra packages;"
+
+    mkdir $CHROOT/usr/ports/packages
+    cp $CHROOT/media/crux/core/* $CHROOT/usr/ports/packages
+    cp $CHROOT/media/crux/opt/* $CHROOT/usr/ports/packages
+    cp $CHROOT/media/crux/xorg/* $CHROOT/usr/ports/packages
+
+    echo "Installing $CHROOT/usr/ports/packages/fakeroot#1.20.2-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/fakeroot#1.20.2-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/dbus#1.10.2-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/dbus#1.10.2-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/expat#2.1.0-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/expat#2.1.0-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/libnl#3.2.27-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libnl#3.2.27-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/libpng#1.6.19-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libpng#1.6.19-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/freetype#2.6.1-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/freetype#2.6.1-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/libffi#3.2.1-2.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libffi#3.2.1-2.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/sqlite3#3.9.2-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/sqlite3#3.9.2-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/python#2.7.10-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/python#2.7.10-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/glib#2.46.2-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/glib#2.46.2-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/grub2#2.00-7.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/grub2#2.00-7.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/grub2-efi#2.00-4.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/grub2-efi#2.00-4.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/wireless-tools#29-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/wireless-tools#29-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/wpa_supplicant#2.5-2.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/wpa_supplicant#2.5-2.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/lvm2#2.02.133-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/lvm2#2.02.133-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/mdadm#3.3.4-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/mdadm#3.3.4-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/efivar#0.21-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/efivar#0.21-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/efibootmgr#0.12-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/efibootmgr#0.12-1.pkg.tar.xz"
+    echo "Installing $CHROOT/usr/ports/packages/dosfstools#3.0.26-1.pkg.tar.xz"
+    $CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/dosfstools#3.0.26-1.pkg.tar.xz"
+
+    echo "1.1.6. Install extra ports;\n"
+
+    mkdir $CHROOT/usr/ports/c9-ports
+    cp -r $DIR_PRT/* $CHROOT/usr/ports/c9-ports/
+
+    echo "1.1.7. dns resolver, copy resolv.conf;\n"
+    cp /etc/resolv.conf $CHROOT/etc
+
+    echo "1.1.8. Install Handbook\n"
+    cp /media/crux/handbook.txt $CHROOT/root/
+
+    echo "1.1.9. Install Skeletons\n"
+    cp -r $DIR_CONF/skel $CHROOT/etc/
+}
+
+setup_crux() {
+
+    echo "1.2.1. Set hostname and hosts;"
+    cp $DIR_CONF/hosts $CHROOT/etc/
+    vim $CHROOT/etc/hosts
+
+    echo "1.2.2. Set timezone;"
+    chroot $CHROOT /bin/bash -c tzselect
+
+    echo "1.2.3. Set locale;"
+    chroot $CHROOT /bin/bash -c "localedef -i en_US -f UTF-8 en_US.UTF-8"
+
+    echo "1.2.4.2. Create Administrator $ADMIN_USER;"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "useradd -U -m -k /etc/skel -s /bin/bash $ADMIN_USER"
+
+    echo "1.2.4.3. Add Administrator $ADMIN_USER to wheel group;"
+    chroot $CHROOT /bin/bash -c "usermod -a -G wheel $ADMIN_USER"
+    echo "1.2.4.3. Uncomment to allow members of group wheel to execute any command\n
+    #    %wheel ALL=(ALL) ALL"
+    cp $DIR_CONF/sudoers $CHROOT/etc/
+
+    echo "1.2.5. File system table;"
+    cp $DIR_CONF/fstab $CHROOT/etc/
+    blkid >> $CHROOT/etc/fstab
+    vim $CHROOT/etc/fstab
+
+    echo "1.2.6. Initialization Scripts;"
+    cp $DIR_CONF/rc.conf $CHROOT/etc/
+    vim $CHROOT/etc/rc.conf
+
+}
 
-DIR=$(dirname "$PWD");
-DIR_PRT=$(dirname "$DIR")"/c9-ports";
-DIR_CONF=$DIR"/core/conf"
+setup_ports() {
+    echo "1.3.1. Build as unprivileged user;"
 
-CRUX_ISO="/boot/crux-3.2.iso"
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "useradd -U -m -d /usr/ports -s /bin/false pkgmk"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "usermod -a -G pkgmk $ADMIN_USER"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "chown -R root:pkgmk /usr/ports"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "chmod -R 774 /usr/ports"
+
+    chroot $CHROOT /usr/bin/env -i \
+        HOME=/root TERM="$TERM" PS1='\u:\w\$ ' \
+        PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+        /bin/bash -c "chmod 775 /usr/ports"
+
+    echo "1.3.2. Ports Layout;"
+
+    chroot --userspec=pkgmk:pkgmk $CHROOT /bin/bash -c "mkdir /usr/ports/work"
+    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"
+
+    read PAUSE
+
+    vim $CHROOT/etc/fstab
+
+    echo "1.3.3 Configure pkgmk;"
+    cp $DIR_CONF/pkgmk.conf $CHROOT/etc/
+    #vim $CHROOT/etc/pkgmk.conf
+
+    echo "1.3.4 Configure prt-get;"
+    mv $CHROOT/etc/ports/contrib.rsync.inactive $CHROOT/etc/ports/contrib.rsync
+    cp $DIR_CONF/prt-get.conf $CHROOT/etc/
+    #vim $CHROOT/etc/prt-get.conf
+}
+
+echo "SCRIPT=$SCRIPT";
+echo "SCRIPTPATH=$SCRIPTPATH";
 
 echo "Device: $DEV\n"
 
@@ -48,136 +278,18 @@ echo "1.1.2 root block; ($BLK_ROOT)"
 echo "1.1.2 var block; ($BLK_VAR)"
 #echo "1.1.2 swap block; ($BLK_SWP)\n"
 
+echo "ADMIN_USER="$ADMIN_USER"\n"
 echo "CHROOT=$CHROOT";
 echo "DIR=$DIR";
 echo "DIR_CONF=$DIR_CONF";
 echo "DIR_PRT=$DIR_PRT";
 
-echo "CRUX_ISO=$CRUX_ISO";
+echo "ISO_FILE=$ISO_FILE";
 ConfirmOrExit
 
-echo "1.1.2 Creating File System on $BLK_EFI with fat32:"
-mkfs.fat -F 32 $BLK_EFI
-echo "1.1.2 Creating File System on $BLK_BOOT with ext4:"
-mkfs.ext4 $BLK_BOOT
-echo "1.1.2 Creating File System on $BLK_ROOT with ext4:"
-mkfs.ext4 $BLK_ROOT
-echo "1.1.2 Creating File System on $BLK_VAR with ext4:"
-mkfs.ext4 $BLK_VAR
-#echo "1.1.2 Creating Swap File System on $BLK_SWP:"
-#mkswap $BLK_SWP
-
-echo "1.1.3 mount point to chroot (/mnt):\n"
-mount $BLK_ROOT $CHROOT
-
-mkdir -p $CHROOT/boot
-mount $BLK_BOOT $CHROOT/boot
-mkdir -p $CHROOT/boot/efi
-mount $BLK_EFI $CHROOT/boot/efi
-mkdir -p $CHROOT/var
-mount $BLK_VAR $CHROOT/var
-
-mkdir -p $CHROOT/dev
-mkdir -p $CHROOT/tmp
-mkdir -p $CHROOT/proc
-mkdir -p $CHROOT/sys
-
-mkdir -p $CHROOT/var/lib/pkg
-mkdir -p $CHROOT/usr/ports
-
-mkdir -p $CHROOT/media
-mkdir -p $CHROOT/home
-
-mount --bind /dev $CHROOT/dev
-mount -vt devpts devpts $CHROOT/dev/pts
-mount -vt tmpfs shm $CHROOT/dev/shm
-mount -vt proc proc $CHROOT/proc
-mount -vt sysfs sysfs $CHROOT/sys
-
-mount -o loop $CRUX_ISO $CHROOT/media
-#install_crux() {
-
-echo "1.1.4 Create core.lst and install pkgadd"
-for p in $CHROOT/media/crux/core/*; do echo $p >> $CHROOT/core.lst; done
-
-tar xf "$CHROOT/media/crux/core/pkgutils#5.36-2.pkg.tar.xz" usr/bin/pkgadd -O > $CHROOT/pkgadd
-
-chmod +x $CHROOT/pkgadd
-
-echo "1.1.4 File core.lst complete, review list of packages before continue..."
-read PAUSE
-vim $CHROOT/core.lst
-
-echo "1.1.4 Starting install"
-touch $CHROOT/var/lib/pkg/db
-
-cd $CHROOT
-while read line; do
-    echo "Installing $line;\n"
-    $CHROOT/pkgadd -f -r $CHROOT $line
-done < core.lst
-
-rm $CHROOT/pkgadd
-rm $CHROOT/core.lst
-
-echo "1.1.5. Install extra packages;"
-
-mkdir $CHROOT/usr/ports/packages
-cp $CHROOT/media/crux/core/* $CHROOT/usr/ports/packages
-cp $CHROOT/media/crux/opt/* $CHROOT/usr/ports/packages
-cp $CHROOT/media/crux/xorg/* $CHROOT/usr/ports/packages
-
-echo "Installing $CHROOT/usr/ports/packages/fakeroot#1.20.2-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/fakeroot#1.20.2-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/dbus#1.10.2-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/dbus#1.10.2-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/expat#2.1.0-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/expat#2.1.0-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/libnl#3.2.27-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libnl#3.2.27-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/libpng#1.6.19-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libpng#1.6.19-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/freetype#2.6.1-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/freetype#2.6.1-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/libffi#3.2.1-2.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/libffi#3.2.1-2.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/sqlite3#3.9.2-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/sqlite3#3.9.2-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/python#2.7.10-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/python#2.7.10-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/glib#2.46.2-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/glib#2.46.2-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/grub2#2.00-7.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/grub2#2.00-7.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/grub2-efi#2.00-4.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/grub2-efi#2.00-4.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/wireless-tools#29-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/wireless-tools#29-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/wpa_supplicant#2.5-2.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/wpa_supplicant#2.5-2.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/lvm2#2.02.133-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/lvm2#2.02.133-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/mdadm#3.3.4-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/mdadm#3.3.4-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/efivar#0.21-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/efivar#0.21-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/efibootmgr#0.12-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/efibootmgr#0.12-1.pkg.tar.xz"
-echo "Installing $CHROOT/usr/ports/packages/dosfstools#3.0.26-1.pkg.tar.xz"
-$CHROOT/usr/bin/pkgadd -f -r $CHROOT "$CHROOT/usr/ports/packages/dosfstools#3.0.26-1.pkg.tar.xz"
-
-echo "1.1.6. Install extra ports;\n"
-
-mkdir $CHROOT/usr/ports/c9-ports
-cp -r $DIR_PRT/* $CHROOT/usr/ports/c9-ports/
-
-echo "1.1.7. dns resolver, copy resolv.conf;\n"
-cp /etc/resolv.conf $CHROOT/etc
-
-echo "1.1.8. Install Handbook\n"
-cp /media/crux/handbook.txt $CHROOT/root/
-
-echo "1.1.9. Install Skeletons\n"
-cp -r $DIR_CONF/skel $CHROOT/etc/
-#}
+setup_target
+setup_bin
+setup_crux
+setup_ports
+
 echo "Ready to chroot $CHROOT /bin/bash \n"
diff --git a/core/scripts/setup-iso.sh b/core/scripts/setup-iso.sh
new file mode 100644
index 0000000..93858d6
--- /dev/null
+++ b/core/scripts/setup-iso.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Absolute path to this script, e.g. /home/user/bin/foo.sh
+SCRIPT=$(readlink -f "$0")
+# Absolute path this script is in, thus /home/user/bin
+SCRIPTPATH=$(dirname "$SCRIPT")
+
+DIR=$(dirname "$SCRIPTPATH");
+DIR_LOCAL="$(dirname $(dirname ${DIR}))/local";
+
+ISO_URL="https://serverop.de/crux/crux-3.2/iso/crux-3.2.iso"
+ISO_FILE="${DIR_LOCAL}/crux-3.2.iso"
+
+
+# First we define the function
+ConfirmOrExit ()
+{
+    while true
+    do
+        echo -n "Please confirm (y or n) :"
+        read CONFIRM
+        case $CONFIRM in
+            y|Y|YES|yes|Yes) break ;;
+            n|N|no|NO|No)
+                echo "Aborting - you entered $CONFIRM"
+                exit
+                ;;
+            *) echo "Please enter only y or n"
+        esac
+    done
+    echo "You entered $CONFIRM. Continuing ..."
+}
+
+echo "1.1.1 Path/to crux-3.2.iso:"
+echo $ISO_FILE
+ConfirmOrExit
+
+#prepare_iso() {
+
+    if [ -f $ISO_FILE ];
+    then
+        echo "File $ISO_FILE exists."
+    else
+        echo "File $ISO_FILE does not exist."
+        cd $ISO_PATH && { curl -k -O $ISO_URL ; cd -; }
+    fi
+
+#}
+
diff --git a/core/scripts/setup-target.sh b/core/scripts/setup-target.sh
index 4f38853..e64bfe1 100644
--- a/core/scripts/setup-target.sh
+++ b/core/scripts/setup-target.sh
@@ -27,9 +27,9 @@ ConfirmOrExit
 parted --script $DEV \
     mklabel gpt \
     mkpart ESP fat32 1MiB 120MiB \
-    mkpart primary ext4 120MiB 720MiB \
-    mkpart primary ext4 720MiB 2720MiB \
-    mkpart primary ext4 2720MiB 5000MiB \
+    mkpart primary ext4 120MiB 376MiB \
+    mkpart primary ext4 376MiB 4376MiB \
+    mkpart primary ext4 4376MiB 5000MiB \
     set 1 boot on
 
 exit 0;