progress
This commit is contained in:
parent
99ecc78a12
commit
3ba17d4a31
16
main.sh
16
main.sh
|
@ -164,7 +164,6 @@ base() {
|
|||
. ./etc/base
|
||||
packages
|
||||
reset packages
|
||||
cp ./etc/base $tmp_target
|
||||
}
|
||||
|
||||
gfx() {
|
||||
|
@ -326,15 +325,10 @@ do_install() {
|
|||
|
||||
do_chroot() {
|
||||
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 ./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
|
||||
cp -rf $tmp_target ${target}/tmp/vinstaller/run
|
||||
|
||||
echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars
|
||||
echo "pass=$pass" > ${target}/tmp/vinstaller/vars
|
||||
|
@ -348,8 +342,10 @@ do_chroot() {
|
|||
|
||||
cat <<EOF > ${target}/tmp/vinstaller/main_chroot
|
||||
#!/bin/bash
|
||||
. /tmp/vinstaller/vars
|
||||
. /tmp/vinstaller/functions
|
||||
. /tmp/vinstaller/vars
|
||||
. /tmp/vinstaller/base
|
||||
|
||||
for file in \$(find /tmp/vinstaller/run -type f); do
|
||||
. \$file
|
||||
config
|
||||
|
|
Loading…
Reference in New Issue
Block a user