From fb24ee686d63af7bd911372b1bc487bd66373623 Mon Sep 17 00:00:00 2001
From: Christoph Johannes Kleine <linux@cj-k.de>
Date: Mon, 4 Nov 2019 00:14:27 +0100
Subject: [PATCH] verschiebe include installer.config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
da es mit der bash ausgeführt werden muss
---
files/bootlocal.sh | 3 ---
files/installer.config | 2 ++
files/installer.sh | 7 +++++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/files/bootlocal.sh b/files/bootlocal.sh
index eb3918c..3bfef3f 100644
--- a/files/bootlocal.sh
+++ b/files/bootlocal.sh
@@ -1,9 +1,6 @@
#!/bin/sh
cd /opt
-# include develop config
-. ./installer.config
-
# include functions.sh
. ./functions.sh
diff --git a/files/installer.config b/files/installer.config
index 140d006..0eadf6e 100644
--- a/files/installer.config
+++ b/files/installer.config
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
export DISK_SDA_SCHEME="gpt"
declare -a DISK_SDA_PARTITIONS=()
DISK_SDA_PARTITIONS+=("1GB:fat16:/boot:defaults:0:0:False:boot,esp")
diff --git a/files/installer.sh b/files/installer.sh
index 0ec2c60..aa1e0f2 100755
--- a/files/installer.sh
+++ b/files/installer.sh
@@ -3,13 +3,16 @@
# include functions.sh again, thins it is a new environment
. ./functions.sh
+# include develop config
+. ./installer.config
+
# include diskspreparation.sh
echo "run disks preparation"
. ./diskspreparation.sh
echo "run disks preparation finished"
-# append local fstab, possible problems with outomount included in tinycore
-cat /tmp/fstab.local >> /etc/fstab
+# append local fstab, possible problems with automount included in tinycore
+cat /tmp/fstab.target >> /etc/fstab
# inform kernel about changes
sync
--
GitLab