diff options
| author | emmett1 <emmett1.2miligrams@protonmail.com> | 2024-06-03 23:37:45 +0800 |
|---|---|---|
| committer | emmett1 <emmett1.2miligrams@protonmail.com> | 2024-06-03 23:37:45 +0800 |
| commit | 3f80bb67166389b3acabf8f024ee1ad1a4364c1f (patch) | |
| tree | 152bb8e6dd003022d2546f96e94e10d4682f8590 /utils | |
| parent | d6de06e35bbcc9199ae34a27895f31f194ae45bc (diff) | |
| download | alicelinux-3f80bb67166389b3acabf8f024ee1ad1a4364c1f.tar.gz alicelinux-3f80bb67166389b3acabf8f024ee1ad1a4364c1f.zip | |
utils updated
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mkiso.d/include/etc/issue | 21 | ||||
| -rw-r--r-- | utils/mkiso.d/include/etc/skel/.profile | 9 | ||||
| -rw-r--r-- | utils/mkiso.d/live_script.sh | 32 | ||||
| -rwxr-xr-x | utils/mkiso.sh | 10 |
4 files changed, 35 insertions, 37 deletions
diff --git a/utils/mkiso.d/include/etc/issue b/utils/mkiso.d/include/etc/issue new file mode 100644 index 00000000..e8f879f5 --- /dev/null +++ b/utils/mkiso.d/include/etc/issue @@ -0,0 +1,21 @@ +Alice Linux \r (\l) + +Project page : https://codeberg.org/emmett1/alicelinux + +user login : live +user password: live + +root login : root +root password: root + +run 'sway' after login to start gui + +Some default sway keybindsym reminder: + + Super + Enter : foot terminal + Super + d : menu launcher + Super + Shift + q : quit program + Super + Shift + e : exit sway + +run 'doas poweroff' to poweroff live system + diff --git a/utils/mkiso.d/include/etc/skel/.profile b/utils/mkiso.d/include/etc/skel/.profile new file mode 100644 index 00000000..e425b03b --- /dev/null +++ b/utils/mkiso.d/include/etc/skel/.profile @@ -0,0 +1,9 @@ +# ~/.profile + +export ENV=~/.ashrc + +if [ -z "$XDG_RUNTIME_DIR" ]; then + XDG_RUNTIME_DIR="/tmp/$(id -u)-runtime-dir" + mkdir -pm 0700 "$XDG_RUNTIME_DIR" + export XDG_RUNTIME_DIR +fi diff --git a/utils/mkiso.d/live_script.sh b/utils/mkiso.d/live_script.sh index 61c42eec..bb470dc1 100644 --- a/utils/mkiso.d/live_script.sh +++ b/utils/mkiso.d/live_script.sh @@ -24,35 +24,3 @@ echo $LIVEHOSTNAME > /etc/hostname if [ -f /etc/doas.conf ]; then echo "permit nopass $LIVEUSER" >> /etc/doas.conf fi - -cat <<'EOF' > /etc/skel/.profile -if [ -z "$XDG_RUNTIME_DIR" ]; then - XDG_RUNTIME_DIR="/tmp/$(id -u)-runtime-dir" - mkdir -pm 0700 "$XDG_RUNTIME_DIR" - export XDG_RUNTIME_DIR -fi -EOF - -cat <<'EOF' > /etc/issue -Alice Linux \r (\l) - -Project page : https://codeberg.org/emmett1/alicelinux - -user login : live -user password: live - -root login : root -root password: root - -run 'sway' after login to start gui - -Some default sway keybindsym reminder: - - Super + Enter : foot terminal - Super + d : menu launcher - Super + Shift + q : quit program - Super + Shift + e : exit sway - -run 'doas poweroff' to poweroff live system - -EOF diff --git a/utils/mkiso.sh b/utils/mkiso.sh index 14a91a65..c6fc083d 100755 --- a/utils/mkiso.sh +++ b/utils/mkiso.sh @@ -9,10 +9,10 @@ prepare_rootfs() { bzip2 ca-certificates curl file flex gcc git gmp initscripts linux-headers m4 make mpc mpfr musl openssl patch spm xz zlib" - requiredpkg="linux grub syslinux" + requiredpkg="linux grub syslinux efibootmgr" extrapkg="pfetch sway swaybg swayidle swaylock wmenu mpv foot firefox fff ranger dejavu-fonts-ttf wpa_supplicant dhcpcd - linux-firmware imv lm-sensors opendoas zstd rsync squashfs-tools" + imv lm-sensors opendoas zstd rsync squashfs-tools" mkdir -p $ROOTFS/var/lib/spm/db APKG_NOPROMPT=1 APKG_ROOT=$ROOTFS apkg -I $basepkg $requiredpkg $extrapkg } @@ -106,10 +106,10 @@ make_iso() { [ -f $MKISOD/live_script.sh ] && cp $MKISOD/live_script.sh $ISODIR/boot touch $ISODIR/boot/livemedia - if [ -d $MKISOD/isoinclude ]; then + if [ -d $MKISOD/include ]; then echo "include rootfs files..." ( - cd MKISOD/isoinclude + cd $MKISOD/include chown -R 0:0 * tar -czf $ISODIR/boot/rootfs.gz * ) @@ -155,7 +155,7 @@ EOF sha256sum $OUTPUT > $ISOSUM } -WORKDIR=$PWD/iso +WORKDIR=/tmp/alice-iso ROOTFS=$WORKDIR/rootfs ISODIR=$WORKDIR/liveiso INITRAMFSDIR=$WORKDIR/initramfs |