diff --git a/data/bash_profile b/data/bash_profile index a67d540..e60df67 100755 --- a/data/bash_profile +++ b/data/bash_profile @@ -1,3 +1,8 @@ # .bash_profile -[[ -z $DISPLAY ]] && [[ "$(tty)" == "/dev/tty1" ]] && exec startx +sudo plymouth quit + +if [[ -z $DISPLAY ]] && [[ "$(tty)" == "/dev/tty1" ]] +then + exec startx +fi diff --git a/data/issue b/data/issue index e240ae4..f892983 100644 --- a/data/issue +++ b/data/issue @@ -1 +1 @@ -welcome to minceraft os dude + diff --git a/data/minceraft/run_mine.sh b/data/minceraft/run_mine.sh new file mode 100755 index 0000000..48e35d1 --- /dev/null +++ b/data/minceraft/run_mine.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +./UltimMC -n Steve -o -l 1.21.4 +sudo poweroff diff --git a/data/xinitrc b/data/xinitrc index 04bb6bd..61b8cf1 100755 --- a/data/xinitrc +++ b/data/xinitrc @@ -1,4 +1,4 @@ xsetroot -cursor_name arrow cd /home/player/minceraft -export INST_JAVA=java -exec ./UltimMC -n Steve -o -l 1.21.4 +exec ./run_mine.sh + diff --git a/dracut/vmklive/adduser.sh b/dracut/vmklive/adduser.sh index 3b3ee05..9385472 100644 --- a/dracut/vmklive/adduser.sh +++ b/dracut/vmklive/adduser.sh @@ -36,6 +36,9 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then echo "${USERNAME} ALL=(ALL:ALL) NOPASSWD: ALL" > "${NEWROOT}/etc/sudoers.d/99-void-live" fi +echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/poweroff" > "${NEWROOT}/etc/sudoers.d/99-void-live" +echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/sbin/startx" > "${NEWROOT}/etc/sudoers.d/99-void-live" +echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/plymouth" > "${NEWROOT}/etc/sudoers.d/99-void-live" if [ -d ${NEWROOT}/etc/polkit-1 ]; then # If polkit is installed allow users in the wheel group to run anything. cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in index 4dafed1..3c51baa 100644 --- a/isolinux/isolinux.cfg.in +++ b/isolinux/isolinux.cfg.in @@ -1,10 +1,9 @@ -UI vesamenu.c32 PROMPT 0 TIMEOUT 1 ONTIMEOUT linux - +color black/black black/black LABEL linux MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ KERNEL /boot/vmlinuz -APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ live.autologin live.user=player quiet splash +APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=1 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ live.autologin live.user=player quiet splash vt.color=0 vga=0x301 diff --git a/mkmine.sh b/mkmine.sh index e00b45d..79240ab 100755 --- a/mkmine.sh +++ b/mkmine.sh @@ -29,10 +29,10 @@ umask 022 . ./lib.sh MOSVER="$(cat version)" -REQUIRED_PKGS=(base-files libgcc dash coreutils sed tar gawk squashfs-tools xorriso) -TARGET_PKGS=(base-files) -INITRAMFS_PKGS=(binutils xz device-mapper fbv dhclient dracut-network openresolv plymouth xsetroot) -PACKAGE_LIST=(bash openjdk21 xorg qt5 qt5-devel) +REQUIRED_PKGS=(base-files libgcc plymouth dash coreutils sed tar gawk squashfs-tools xorriso) +TARGET_PKGS=(base-files plymouth) +INITRAMFS_PKGS=(binutils xz device-mapper fbv dhclient dracut-network openresolv xsetroot) +PACKAGE_LIST=(bash openjdk21 xorg qt5 qt5-devel elogind plymouth) IGNORE_PKGS=() PLATFORMS=() readonly PROGNAME="$(basename "$0")" @@ -109,6 +109,12 @@ post_install_packages() { echo "dm-raid" > "$ROOTFS"/etc/modules-load.d/dm-raid.conf break done + + chroot "$ROOTFS" xbps-install -S plymouth + + install_plymouth + + ls "$ROOTFS"/usr/bin } install_plymouth() { @@ -125,7 +131,7 @@ install_packages() { LANG=C XBPS_TARGET_ARCH=$TARGET_ARCH "${XBPS_INSTALL_CMD}" -U -r "$ROOTFS" \ ${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -y "${PACKAGE_LIST[@]}" "${INITRAMFS_PKGS[@]}" [ $? -ne 0 ] && die "Failed to install ${PACKAGE_LIST[*]} ${INITRAMFS_PKGS[*]}" - + xbps-reconfigure -r "$ROOTFS" -f base-files >/dev/null 2>&1 chroot "$ROOTFS" env -i xbps-reconfigure -f base-files @@ -166,6 +172,8 @@ enable_services() { fi ln -sf /etc/sv/$service $ROOTFS/etc/runit/runsvdir/default/ done + ln -sf /etc/sv/plymouthd $ROOTFS/etc/runit/runsvdir/default/ + ln -sf /etc/sv/elogind $ROOTFS/etc/runit/runsvdir/default/ } change_shell() { @@ -528,11 +536,11 @@ mkdir -p "$ROOTFS" "$VOIDHOSTDIR" "$VOIDTARGETDIR" "$GRUB_DIR" "$ISOLINUX_DIR" print_step "Synchronizing XBPS repository data..." copy_void_keys "$ROOTFS" -XBPS_ARCH=$TARGET_ARCH $XBPS_INSTALL_CMD -r "$ROOTFS" ${XBPS_REPOSITORY} -S +XBPS_ARCH=$TARGET_ARCH $XBPS_INSTALL_CMD -r "$ROOTFS" ${XBPS_REPOSITORY} -Sy copy_void_keys "$VOIDHOSTDIR" -XBPS_ARCH=$HOST_ARCH $XBPS_INSTALL_CMD -r "$VOIDHOSTDIR" ${XBPS_REPOSITORY} -S +XBPS_ARCH=$HOST_ARCH $XBPS_INSTALL_CMD -r "$VOIDHOSTDIR" ${XBPS_REPOSITORY} -Sy copy_void_keys "$VOIDTARGETDIR" -XBPS_ARCH=$TARGET_ARCH $XBPS_INSTALL_CMD -r "$VOIDTARGETDIR" ${XBPS_REPOSITORY} -S +XBPS_ARCH=$TARGET_ARCH $XBPS_INSTALL_CMD -r "$VOIDTARGETDIR" ${XBPS_REPOSITORY} -Sy # Get linux version for ISO # If linux version option specified use @@ -638,6 +646,9 @@ cp -r data/cursors "$ROOTFS"/usr/share/icons/default/cursors cp data/index.theme "$ROOTFS"/usr/share/icons/default/index.theme chmod -R 755 "$ROOTFS"/usr/share/icons/default/cursors +cat "$ROOTFS"/etc +cat "$ROOTFS"/etc/X11 + print_step "Cleaning up rootfs..." cleanup_rootfs