Skip to content

Commit

Permalink
attempt to hijack
Browse files Browse the repository at this point in the history
  • Loading branch information
oklopfer committed May 11, 2024
1 parent a003cf1 commit 8e280c1
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
if [[ "${{ matrix.type }}" == "tarball" ]]; then
cp binary_rootfs /usr/lib/live/build/binary_rootfs
fi
cp lb_chroot_devpts /usr/lib/live/build/lb_chroot_devpts
- name: Make scripts executable
run: chmod -R +x build.sh etc/auto/config etc/terraform.conf etc/
Expand Down
5 changes: 2 additions & 3 deletions etc/config/hooks/live/099-install-custom-apps.chroot
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ sudo chown "rhino-live" -cR "/home/rhino-live"
sudo chown "rhino-live" -cR "/var/cache/pacstall"
git config --global --add safe.directory '*'

sudo sysctl -w kernel.unprivileged_userns_clone=1
#HOME=/home/rhino-live runuser -l rhino-live -c 'pacstall -U oklopfer:rhinobwrap'
HOME=/home/rhino-live runuser -l rhino-live -c 'pacstall -U oklopfer:rhinobwrap'
#Pacstall installs
HOME=/home/rhino-live runuser -l rhino-live -c 'if [ $(dpkg --print-architecture) = arm64 ]; then FIREFOX="firefox-arm64-deb"; else FIREFOX="firefox-bin"; fi; SUDO_USER=rhino-live PACSTALL_DOWNLOADER=quiet-wget pacstall -PI nala-deb ${FIREFOX} vscodium-deb celeste-bin linux-kernel-stable rhino-core quintom-cursor-theme-git timeshift fake-ubuntu-advantage-tools-deb'
HOME=/home/rhino-live runuser -l rhino-live -c 'SUDO_USER=rhino-live PACSTALL_DOWNLOADER=quiet-wget pacstall -PI rhino-setup-bin'
#HOME=/home/rhino-live runuser -l rhino-live -c 'pacstall -U pacstall:master'
HOME=/home/rhino-live runuser -l rhino-live -c 'pacstall -U pacstall:master'

#Hack: arm64 firefox no snap
if [ $(dpkg --print-architecture) = arm64 ]; then
Expand Down
93 changes: 93 additions & 0 deletions lb_chroot_devpts
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
#!/bin/sh

## live-build(7) - System Build Scripts
## Copyright (C) 2006-2012 Daniel Baumann <[email protected]>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.


set -e

# Including common functions
( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh

# Setting static variables
DESCRIPTION="$(Echo 'mount /dev/pts')"
HELP=""
USAGE="${PROGRAM} {install|remove} [--force]"

Arguments "${@}"

# Ensure that a system is built as root
lb testroot

# Reading configuration files
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults

# Requiring stage file
Require_stagefile .build/config .build/bootstrap

case "${1}" in
install)
Echo_message "Begin mounting /dev/pts..."

# Checking stage file
Check_stagefile .build/chroot_devpts

# Checking lock file
Check_lockfile .lock

# Creating lock file
Create_lockfile .lock

if [ "${LB_USE_FAKEROOT}" != "true" ]
then
# Creating mountpoint
mkdir -p chroot/dev/pts

# Mounting /dev/pts
${LB_ROOT_COMMAND} mount --bind chroot chroot || true
${LB_ROOT_COMMAND} mount devpts-live -t devpts -o gid=5,mode=620 chroot/dev/pts || true
fi

# Creating stage file
Create_stagefile .build/chroot_devpts
;;

remove)
Echo_message "Begin unmounting /dev/pts..."

# Checking lock file
Check_lockfile .lock

# Creating lock file
Create_lockfile .lock

# Unmounting /dev/pts
if [ "${LB_USE_FAKEROOT}" != "true" ]
then
if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
then
${LB_ROOT_COMMAND} umount chroot/dev/pts
else
${LB_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
fi
if grep -qs "$(pwd)/chroot" /proc/mounts || Find_files chroot/*
then
${LB_ROOT_COMMAND} umount chroot/
else
${LB_ROOT_COMMAND} umount -f chroot/ > /dev/null 2>&1 || true
fi
fi

# Removing stage file
rm -f .build/chroot_devpts
;;

*)
Usage
;;
esac

0 comments on commit 8e280c1

Please sign in to comment.