mirror of
https://github.com/MeexReay/minceraftOS.git
synced 2025-06-24 02:22:59 +03:00
plymouth fix and tty disable
This commit is contained in:
parent
9deb67ad63
commit
93fb93c7d8
@ -1,3 +1,8 @@
|
|||||||
# .bash_profile
|
# .bash_profile
|
||||||
|
|
||||||
[[ -z $DISPLAY ]] && [[ "$(tty)" == "/dev/tty1" ]] && exec startx
|
sudo plymouth quit
|
||||||
|
|
||||||
|
if [[ -z $DISPLAY ]] && [[ "$(tty)" == "/dev/tty1" ]]
|
||||||
|
then
|
||||||
|
exec startx
|
||||||
|
fi
|
||||||
|
@ -1 +1 @@
|
|||||||
welcome to minceraft os dude
|
[30;40m
|
||||||
|
4
data/minceraft/run_mine.sh
Executable file
4
data/minceraft/run_mine.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
./UltimMC -n Steve -o -l 1.21.4
|
||||||
|
sudo poweroff
|
@ -1,4 +1,4 @@
|
|||||||
xsetroot -cursor_name arrow
|
xsetroot -cursor_name arrow
|
||||||
cd /home/player/minceraft
|
cd /home/player/minceraft
|
||||||
export INST_JAVA=java
|
exec ./run_mine.sh
|
||||||
exec ./UltimMC -n Steve -o -l 1.21.4
|
|
||||||
|
@ -36,6 +36,9 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then
|
|||||||
echo "${USERNAME} ALL=(ALL:ALL) NOPASSWD: ALL" > "${NEWROOT}/etc/sudoers.d/99-void-live"
|
echo "${USERNAME} ALL=(ALL:ALL) NOPASSWD: ALL" > "${NEWROOT}/etc/sudoers.d/99-void-live"
|
||||||
fi
|
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 [ -d ${NEWROOT}/etc/polkit-1 ]; then
|
||||||
# If polkit is installed allow users in the wheel group to run anything.
|
# If polkit is installed allow users in the wheel group to run anything.
|
||||||
cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF
|
cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF
|
||||||
|
@ -1,10 +1,9 @@
|
|||||||
UI vesamenu.c32
|
|
||||||
PROMPT 0
|
PROMPT 0
|
||||||
TIMEOUT 1
|
TIMEOUT 1
|
||||||
ONTIMEOUT linux
|
ONTIMEOUT linux
|
||||||
|
color black/black black/black
|
||||||
|
|
||||||
LABEL linux
|
LABEL linux
|
||||||
MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@
|
MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@
|
||||||
KERNEL /boot/vmlinuz
|
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
|
||||||
|
27
mkmine.sh
27
mkmine.sh
@ -29,10 +29,10 @@ umask 022
|
|||||||
. ./lib.sh
|
. ./lib.sh
|
||||||
|
|
||||||
MOSVER="$(cat version)"
|
MOSVER="$(cat version)"
|
||||||
REQUIRED_PKGS=(base-files libgcc dash coreutils sed tar gawk squashfs-tools xorriso)
|
REQUIRED_PKGS=(base-files libgcc plymouth dash coreutils sed tar gawk squashfs-tools xorriso)
|
||||||
TARGET_PKGS=(base-files)
|
TARGET_PKGS=(base-files plymouth)
|
||||||
INITRAMFS_PKGS=(binutils xz device-mapper fbv dhclient dracut-network openresolv plymouth xsetroot)
|
INITRAMFS_PKGS=(binutils xz device-mapper fbv dhclient dracut-network openresolv xsetroot)
|
||||||
PACKAGE_LIST=(bash openjdk21 xorg qt5 qt5-devel)
|
PACKAGE_LIST=(bash openjdk21 xorg qt5 qt5-devel elogind plymouth)
|
||||||
IGNORE_PKGS=()
|
IGNORE_PKGS=()
|
||||||
PLATFORMS=()
|
PLATFORMS=()
|
||||||
readonly PROGNAME="$(basename "$0")"
|
readonly PROGNAME="$(basename "$0")"
|
||||||
@ -109,6 +109,12 @@ post_install_packages() {
|
|||||||
echo "dm-raid" > "$ROOTFS"/etc/modules-load.d/dm-raid.conf
|
echo "dm-raid" > "$ROOTFS"/etc/modules-load.d/dm-raid.conf
|
||||||
break
|
break
|
||||||
done
|
done
|
||||||
|
|
||||||
|
chroot "$ROOTFS" xbps-install -S plymouth
|
||||||
|
|
||||||
|
install_plymouth
|
||||||
|
|
||||||
|
ls "$ROOTFS"/usr/bin
|
||||||
}
|
}
|
||||||
|
|
||||||
install_plymouth() {
|
install_plymouth() {
|
||||||
@ -125,7 +131,7 @@ install_packages() {
|
|||||||
LANG=C XBPS_TARGET_ARCH=$TARGET_ARCH "${XBPS_INSTALL_CMD}" -U -r "$ROOTFS" \
|
LANG=C XBPS_TARGET_ARCH=$TARGET_ARCH "${XBPS_INSTALL_CMD}" -U -r "$ROOTFS" \
|
||||||
${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -y "${PACKAGE_LIST[@]}" "${INITRAMFS_PKGS[@]}"
|
${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -y "${PACKAGE_LIST[@]}" "${INITRAMFS_PKGS[@]}"
|
||||||
[ $? -ne 0 ] && die "Failed to install ${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
|
xbps-reconfigure -r "$ROOTFS" -f base-files >/dev/null 2>&1
|
||||||
chroot "$ROOTFS" env -i xbps-reconfigure -f base-files
|
chroot "$ROOTFS" env -i xbps-reconfigure -f base-files
|
||||||
|
|
||||||
@ -166,6 +172,8 @@ enable_services() {
|
|||||||
fi
|
fi
|
||||||
ln -sf /etc/sv/$service $ROOTFS/etc/runit/runsvdir/default/
|
ln -sf /etc/sv/$service $ROOTFS/etc/runit/runsvdir/default/
|
||||||
done
|
done
|
||||||
|
ln -sf /etc/sv/plymouthd $ROOTFS/etc/runit/runsvdir/default/
|
||||||
|
ln -sf /etc/sv/elogind $ROOTFS/etc/runit/runsvdir/default/
|
||||||
}
|
}
|
||||||
|
|
||||||
change_shell() {
|
change_shell() {
|
||||||
@ -528,11 +536,11 @@ mkdir -p "$ROOTFS" "$VOIDHOSTDIR" "$VOIDTARGETDIR" "$GRUB_DIR" "$ISOLINUX_DIR"
|
|||||||
|
|
||||||
print_step "Synchronizing XBPS repository data..."
|
print_step "Synchronizing XBPS repository data..."
|
||||||
copy_void_keys "$ROOTFS"
|
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"
|
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"
|
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
|
# Get linux version for ISO
|
||||||
# If linux version option specified use
|
# 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
|
cp data/index.theme "$ROOTFS"/usr/share/icons/default/index.theme
|
||||||
chmod -R 755 "$ROOTFS"/usr/share/icons/default/cursors
|
chmod -R 755 "$ROOTFS"/usr/share/icons/default/cursors
|
||||||
|
|
||||||
|
cat "$ROOTFS"/etc
|
||||||
|
cat "$ROOTFS"/etc/X11
|
||||||
|
|
||||||
print_step "Cleaning up rootfs..."
|
print_step "Cleaning up rootfs..."
|
||||||
cleanup_rootfs
|
cleanup_rootfs
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user