Skip to content

Commit

Permalink
add jade installer, fix ca-certs, fix iso mount, add packages.txt in …
Browse files Browse the repository at this point in the history
…subprofile
  • Loading branch information
YukariChiba committed Aug 15, 2024
1 parent 472f302 commit 0eaeb03
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- `packages.{target_arch}.txt`: (Optional) packages to be installed for a specific arch
- `files/`: (Optional) files to be used in global `config.sh`, installed to `/.files/` before `config.sh`
- `subprofiles/{subprofile}/`: (Optional) subprofile directory
- `packages.txt`: (Optional) packages to be installed (after global config scripts)
- `config.sh`: (Optional) config script in chroot
- `files/`: (Optional) files to be used in subprofile level `config.sh`, installed to `/.files/` before `config.sh`
- `title.txt`: (Optional) title to be used in limine menu, which defaults to be subprofile name
Expand Down
2 changes: 1 addition & 1 deletion config/liveimage/set_fstab.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdir -p /live

cat <<EOF >>/etc/fstab
LABEL=EWE_ISO /live iso9660 defaults 0 0
LABEL=EWE_ISO /live iso9660 defaults,ro 0 0
EOF
3 changes: 0 additions & 3 deletions profiles/liveimage-desktop/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ fcitx5
fcitx5-gtk
mimalloc
bash-completion
activate-linux
tzdata
turnstile
firefox
yaft
idump
3 changes: 3 additions & 0 deletions profiles/liveimage-desktop/subprofiles/cli-fb/packages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jade
yaft
idump
1 change: 1 addition & 0 deletions profiles/liveimage-desktop/subprofiles/cli/packages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jade
2 changes: 2 additions & 0 deletions profiles/liveimage-desktop/subprofiles/desktop/packages.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jade-gui
activate-linux
4 changes: 4 additions & 0 deletions utils/hooks-subprofiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ live
live-$subprofile
EOF

if [ -f profiles/$PROFILE/subprofiles/$subprofile/packages.txt ]; then
$RUNAS pacstrap -G -M -c -C ./pacman.ewe.conf ./tmpdir/rootfs `cat profiles/$PROFILE/subprofiles/$subprofile/packages.txt | xargs`
fi

if [ -d profiles/$PROFILE/subprofiles/$subprofile/files ]; then
_logtxt "#### copying files"
$RUNAS cp -r profiles/$PROFILE/subprofiles/$subprofile/files ./tmpdir/rootfs/.files
Expand Down
2 changes: 1 addition & 1 deletion utils/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _logtxt "#### bootstrapping base system"

mount_overlay base

$RUNAS pacstrap -G -M -c -C ./pacman.ewe.conf ./tmpdir/rootfs base-baremetal
$RUNAS pacstrap -G -M -c -C ./pacman.ewe.conf ./tmpdir/rootfs base-baremetal ca-certificates

umount_overlay

Expand Down

0 comments on commit 0eaeb03

Please sign in to comment.