diff --git a/files/installer.sh b/files/installer.sh index aa1e0f22d3a21549bd3183c6aae08cbd1edf7acd..f552f1e329c16ecfc1a5e01165140d3d2f5f6afe 100755 --- a/files/installer.sh +++ b/files/installer.sh @@ -1,35 +1,21 @@ #!/usr/bin/env bash -# include functions.sh again, thins it is a new environment -. ./functions.sh +. /opt/functions.sh -# include develop config -. ./installer.config +. /tmp/answerfile # include diskspreparation.sh -echo "run disks preparation" -. ./diskspreparation.sh -echo "run disks preparation finished" +beginLogEntry "run disks preparation" +. /opt/diskspreparation.sh +finishLogEntry "done" -# append local fstab, possible problems with automount included in tinycore +beginLogEntry "mount target disks" cat /tmp/fstab.target >> /etc/fstab - -# inform kernel about changes -sync -sleep 2 -partprobe -sleep 2 - -# mount all unmounted file systems mount -a -echo "mounting file systems" +finishLogEntry "done" -# include runinstaller.sh if it exists -if [ -f runinstaller.sh ] - then - echo "run installer" - . ./runinstaller.sh - echo "run installer finished" - else - echo "file runinstaller.sh not found" +if [ -f runinstaller.sh ]; +then + . /opt/runinstaller.sh fi +