teldra/vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

Browse Source
This commit is contained in:
teldra 2022-02-07 16:07:10 +01:00
parent 99ecc78a12
commit 3ba17d4a31
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.sh
View File

@ -164,7 +164,6 @@ base() {
. ./etc/base . ./etc/base
packages packages
reset packages reset packages
cp ./etc/base $tmp_target
} }
gfx() { gfx() {
@ -326,15 +325,10 @@ do_install() {
do_chroot() { do_chroot() {
mkdir -p ${target}/tmp/vinstaller/run mkdir -p ${target}/tmp/vinstaller/run
cp ./etc/functions ${target}/tmp/vinstaller/
cp ./etc/base ${target}/tmp/vinstaller/
cp ./etc/base ${target}/tmp/vinstaller/run cp -rf $tmp_target ${target}/tmp/vinstaller/run
cp ./etc/functions ${target}/tmp/vinstaller/run
if ! [ "$DE" == "minimal" ]; then
cp ./etc/gfx/$GFX ${target}/tmp/vinstaller/run
cp ./etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run
cp ./etc/de/$DE ${target}/tmp/vinstaller/run
cp ./etc/x11 ${target}/tmp/vinstaller/run
fi
echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars
echo "pass=$pass" > ${target}/tmp/vinstaller/vars echo "pass=$pass" > ${target}/tmp/vinstaller/vars
@ -348,8 +342,10 @@ do_chroot() {
cat <<EOF > ${target}/tmp/vinstaller/main_chroot cat <<EOF > ${target}/tmp/vinstaller/main_chroot
#!/bin/bash #!/bin/bash
. /tmp/vinstaller/vars
. /tmp/vinstaller/functions . /tmp/vinstaller/functions
. /tmp/vinstaller/vars
. /tmp/vinstaller/base
for file in \$(find /tmp/vinstaller/run -type f); do for file in \$(find /tmp/vinstaller/run -type f); do
. \$file . \$file
config config