Merge pull request #4 from lin1328/main

Add support for CentOS LXC

Author: Moe-hacker

README.md

@@ -4,16 +4,18 @@
 - alpine
   - 3.20
   - `edge`
-- ubuntu
-  - focal
-  - `jammy`
-  - noble
-  - `oracular`
+- centos
+  - `9-Stream`
 - debian
   - `bookworm`
   - bullseye
   - buster
   - trixie
+- ubuntu
+  - focal
+  - `jammy`
+  - noble
+  - `oracular`
 # Note:
 This module is only for armv8+       
 Tested only on the marked system versions, if there's any bugs, please report        

config.conf

@@ -23,7 +23,7 @@ CONTAINER_DIR="/data/${RURIMA_LXC_OS}"
 
 # In a chroot environment, the default interpreters and service startup commands may not be universal across different systems
 case "$RURIMA_LXC_OS" in
-    ubuntu|debian|archlinux)
+    archlinux|centos|debian|ubuntu)
         SHELL="bash"
         ;;
     alpine)
@@ -34,22 +34,18 @@ case "$RURIMA_LXC_OS" in
         ;;
 esac
 
+# The servicectl command is an open-source project. If you find it inconvenient to use, you can opt for other startup commands It is not mandatory
+# e.g. /usr/sbin/sshd
 case "$RURIMA_LXC_OS" in
-    ubuntu|debian)
-        START_SERVICES="service ssh start"
-        ;;
-    arch|archlinux)
-        START_SERVICES="/usr/sbin/sshd"
+    archlinux|centos)
+        START_SERVICES="servicectl start sshd"
         ;;
-    centos|rhel)
-        START_SERVICES=""
+    debian|ubuntu)
+        START_SERVICES="service ssh start"
         ;;
     alpine)
         START_SERVICES="rc-service sshd restart"
         ;;
-    kali)
-        START_SERVICES=""
-        ;;
     *)
         :
         ;;

customize.sh

@@ -13,8 +13,9 @@ bootinspect() {
         ui_print "- Install from Magisk"
         ui_print "- Magisk Version：$MAGISK_VER（App）+ $MAGISK_VER_CODE"
     else
-        ui_print "- Unsupported installation mode. Please install from the application (Magisk/KernelSu/Apatch)"
+        abort "- Unsupported installation mode. Please install from the application (Magisk/KernelSu/Apatch)"
     fi
+    [ "$ARCH" != "arm64" ] && abort "- Unsupported platform: $ARCH" || ui_print "- Device platform: $ARCH"
 }
 
 link_busybox() {
@@ -61,32 +62,35 @@ configuration() {
 
     export PATH="$MODPATH/bin:$PATH"
 
-    if [[ -e $CONTAINER_DIR/* ]]; then
+    if [[ -d $CONTAINER_DIR ]]; then
         ui_print "- Already installed"
         ruri -U "$CONTAINER_DIR"
-        rm -rf "$CONTAINER_DIR"
-        ui_print "- Uninstall the container and clean up related directories and files"
+        mv -f "$CONTAINER_DIR" "$CONTAINER_DIR".old
+        ui_print "- Shut down the container and back up the relevant directories and files to the ${RURIMA_LXC_OS}.old"
     fi
 }
 
 automatic() {
     ui_print "- A network connection is required to download the root filesystem. Please connect to WiFi before installation whenever possible"
     ui_print "- Downloading the root filesystem using the source ${RURIMA_LXC_MIRROR}..."
+
     rurima lxc pull -n -m ${RURIMA_LXC_MIRROR} -o ${RURIMA_LXC_OS} -v ${RURIMA_LXC_OS_VERSION} -s "$CONTAINER_DIR"
+
     ui_print "- Starting the chroot environment to perform automated installation..."
     ui_print "- Please ensure the network environment is stable. The process may take some time, so please be patient!"
     ui_print ""
     sleep 3
     echo "$HOSTNAME" >"$CONTAINER_DIR"/etc/hostname
-    mkdir "$CONTAINER_DIR"/tmp >/dev/null 2>&1
+    mkdir -p "$CONTAINER_DIR"/tmp "$CONTAINER_DIR"/usr/local/lib/servicectl/enabled >/dev/null 2>&1
     cp "$MODPATH/setup/${RURIMA_LXC_OS}.sh" "$CONTAINER_DIR"/tmp/setup.sh
-    chmod 777 "$CONTAINER_DIR"/tmp/setup.sh
+    cp -r "$MODPATH"/setup/servicectl/* "$CONTAINER_DIR"/usr/local/lib/servicectl/
+    chmod 777 "$CONTAINER_DIR"/tmp/setup.sh "$CONTAINER_DIR"/usr/local/lib/servicectl/servicectl "$CONTAINER_DIR"/usr/local/lib/servicectl/serviced
     sed -i "s/PASSWORD=\"\"/PASSWORD=\"$PASSWORD\"/g" "$CONTAINER_DIR"/tmp/setup.sh
     sed -i "s/PORT=\"\"/PORT=\"$PORT\"/g" "$CONTAINER_DIR"/tmp/setup.sh
+
     ruri "$CONTAINER_DIR" /bin/"$SHELL" /tmp/setup.sh
 
     inotifyfile
-
     #rm "$CONTAINER_DIR"/tmp/setup.sh
     ui_print "- Automated installation completed!"
     ui_print "- Note: Please change the default password. Exposing an SSH port with password authentication instead of key-based authentication is always a high-risk behavior!"

inotify.sh

@@ -10,7 +10,7 @@ if command -v magisk 2>&1 >/dev/null; then
 fi
 
 until [ $(getprop sys.boot_completed) -eq 1 ]; do
-    sleep 3
+    sleep 2
 done
 
 [ ! -f "$MODULEDIR"/disable ] && "$MODULEDIR"/start.sh
@@ -39,5 +39,8 @@ sed -i "6cdescription=$DESCRIPTION" "$MODULEDIR"/module.prop
         done
 ) &
 
+pid=$!
+sed -i "s/^pid=\".*\"$/pid=\"$pid\"/" "$MODULEDIR/service.sh"
+
 # If issues arise after installation, please uncomment. After restarting the system, enable/disable the module, and then check the "debug.log" output file in the current directory to determine whether the monitoring script is functioning properly
 # After checking, please delete or comment out line 22, as no log cleanup operation has been added.

module.prop

@@ -1,6 +1,6 @@
 id=asl
 name=Android Subsystem for GNU/Linux
-version=v0.0.1
-versionCode=202411
+version=v0.0.2
+versionCode=202412
 author=Moe-hacker
 description=Android Subsystem for GNU/Linux Powered by ruri

post-fs-data.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+MODDIR=${0%/*}
+pid=""
+
+while [ $(getprop sys.boot_completed) != 1 ]; do
+  sleep 3
+done
+
+if [ -z "$pid" ] || ! kill -0 "$pid" 2>/dev/null; then
+    "$MODDIR"/start.sh
+else
+    sed -i 's/^pid=".*"/pid=""/' "$(realpath "$0")"
+fi

service.sh

@@ -24,4 +24,3 @@ grep -q "^#*PasswordAuthentication" /etc/ssh/sshd_config || echo "PasswordAuthen
 sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
 sed -i 's/^UsePAM yes/UsePAM no/' /etc/ssh/sshd_config
 sed -i "s/^#Port 22/Port ${PORT}/" /etc/ssh/sshd_config
-# rm $(readlink -f $0)

setup/alpine.sh

@@ -1,7 +1,7 @@
 PASSWORD=""
 PORT=""
 rm -rf /etc/resolv.conf && touch /etc/resolv.conf
-echo "nameserver 1.0.0.1" >> /etc/resolv.conf
+echo "nameserver 1.1.1.1" >> /etc/resolv.conf
 echo "nameserver 114.114.114.114" >> /etc/resolv.conf
 echo "nameserver 2606:4700:4700::1111" >> /etc/resolv.conf
 groupadd -g 1000 aid_system 2>/dev/null || groupadd -g 1074 aid_system 2>/dev/null
@@ -141,13 +141,21 @@ pacman-key --populate archlinuxarm
 pacman -Sy --noconfirm archlinux-keyring archlinuxarm-keyring
 pacman -Rs linux-aarch64 linux-firmware --noconfirm
 pacman -Syu --noconfirm
-pacman -Sy --noconfirm --needed sudo openssh
+pacman -Sy --noconfirm --needed openssh
 # When packaging a software package (such as an AUR package) using `makepkg`, you may encounter an issue where the system cannot enter the fakeroot environment because it is not started by systemd and does not have SYSV pipes and message queues
 # To resolve this issue, download the appropriate `fakeroot-tcp` for your system =>>https://pkgs.org/download/fakeroot-tcp
 # pacman -S --overwrite '*' yay     # It is necessary to compile `archlinuxcn-keyring` by yourself
-sed -i "/^# *%wheel *ALL=(ALL:ALL) ALL$/s/^# *//" /etc/sudoers
+# sed -i "/^# *%wheel *ALL=(ALL:ALL) ALL$/s/^# *//" /etc/sudoers
 sed -i "s/^#PermitRootLogin.*/PermitRootLogin yes/" /etc/ssh/sshd_config
 sed -i "s/^#PasswordAuthentication.*/PasswordAuthentication yes/" /etc/ssh/sshd_config
 sed -i "s/^UsePAM yes/UsePAM no/" /etc/ssh/sshd_config
 sed -i "s/^#Port 22/Port 22/" /etc/ssh/sshd_config
-ssh-keygen -A
+ln -s /usr/local/lib/servicectl/serviced /usr/bin/serviced
+ln -s /usr/local/lib/servicectl/servicectl /usr/bin/servicectl
+# ln -s /usr/lib/systemd/system/sshd.service /usr/local/lib/servicectl/enabled/sshd.service
+# if grep -q "java" /usr/local/lib/servicectl/enabled/sshd.service; then
+#     rm -f /usr/local/lib/servicectl/enabled/sshd.service
+#     echo "/usr/lib/systemd/system/sshd.service" > /usr/local/lib/servicectl/enabled/sshd.service
+#     # cat /usr/lib/systemd/system/sshd.service > /usr/local/lib/servicectl/enabled/sshd.service
+# fi
+ssh-keygen -A

setup/archlinux.sh

@@ -0,0 +1,121 @@
+PASSWORD=""
+PORT=""
+rm -rf /etc/resolv.conf && touch /etc/resolv.conf
+echo "nameserver 1.1.1.1" >> /etc/resolv.conf
+echo "nameserver 114.114.114.114" >> /etc/resolv.conf
+groupadd -g 1000 aid_system 2>/dev/null || groupadd -g 1074 aid_system 2>/dev/null
+groupadd -g 1001 aid_radio
+groupadd -g 1002 aid_bluetooth
+groupadd -g 1003 aid_graphics
+groupadd -g 1004 aid_input
+groupadd -g 1005 aid_audio
+groupadd -g 1006 aid_camera
+groupadd -g 1007 aid_log
+groupadd -g 1008 aid_compass
+groupadd -g 1009 aid_mount
+groupadd -g 1010 aid_wifi
+groupadd -g 1011 aid_adb
+groupadd -g 1012 aid_install
+groupadd -g 1013 aid_media
+groupadd -g 1014 aid_dhcp
+groupadd -g 1015 aid_sdcard_rw
+groupadd -g 1016 aid_vpn
+groupadd -g 1017 aid_keystore
+groupadd -g 1018 aid_usb
+groupadd -g 1019 aid_drm
+groupadd -g 1020 aid_mdnsr
+groupadd -g 1021 aid_gps
+groupadd -g 1023 aid_media_rw
+groupadd -g 1024 aid_mtp
+groupadd -g 1026 aid_drmrpc
+groupadd -g 1027 aid_nfc
+groupadd -g 1028 aid_sdcard_r
+groupadd -g 1029 aid_clat
+groupadd -g 1030 aid_loop_radio
+groupadd -g 1031 aid_media_drm
+groupadd -g 1032 aid_package_info
+groupadd -g 1033 aid_sdcard_pics
+groupadd -g 1034 aid_sdcard_av
+groupadd -g 1035 aid_sdcard_all
+groupadd -g 1036 aid_logd
+groupadd -g 1037 aid_shared_relro
+groupadd -g 1038 aid_dbus
+groupadd -g 1039 aid_tlsdate
+groupadd -g 1040 aid_media_ex
+groupadd -g 1041 aid_audioserver
+groupadd -g 1042 aid_metrics_coll
+groupadd -g 1043 aid_metricsd
+groupadd -g 1044 aid_webserv
+groupadd -g 1045 aid_debuggerd
+groupadd -g 1046 aid_media_codec
+groupadd -g 1047 aid_cameraserver
+groupadd -g 1048 aid_firewall
+groupadd -g 1049 aid_trunks
+groupadd -g 1050 aid_nvram
+groupadd -g 1051 aid_dns
+groupadd -g 1052 aid_dns_tether
+groupadd -g 1053 aid_webview_zygote
+groupadd -g 1054 aid_vehicle_network
+groupadd -g 1055 aid_media_audio
+groupadd -g 1056 aid_media_video
+groupadd -g 1057 aid_media_image
+groupadd -g 1058 aid_tombstoned
+groupadd -g 1059 aid_media_obb
+groupadd -g 1060 aid_ese
+groupadd -g 1061 aid_ota_update
+groupadd -g 1062 aid_automotive_evs
+groupadd -g 1063 aid_lowpan
+groupadd -g 1064 aid_hsm
+groupadd -g 1065 aid_reserved_disk
+groupadd -g 1066 aid_statsd
+groupadd -g 1067 aid_incidentd
+groupadd -g 1068 aid_secure_element
+groupadd -g 1069 aid_lmkd
+groupadd -g 1070 aid_llkd
+groupadd -g 1071 aid_iorapd
+groupadd -g 1072 aid_gpu_service
+groupadd -g 1073 aid_network_stack
+groupadd -g 2000 aid_shell
+groupadd -g 2001 aid_cache
+groupadd -g 2002 aid_diag
+groupadd -g 2900 aid_oem_reserved_start
+groupadd -g 2999 aid_oem_reserved_end
+groupadd -g 3001 aid_net_bt_admin
+groupadd -g 3002 aid_net_bt
+groupadd -g 3003 aid_inet
+groupadd -g 3004 aid_net_raw
+groupadd -g 3005 aid_net_admin
+groupadd -g 3006 aid_net_bw_stats
+groupadd -g 3007 aid_net_bw_acct
+groupadd -g 3009 aid_readproc
+groupadd -g 3010 aid_wakelock
+groupadd -g 3011 aid_uhid
+groupadd -g 9997 aid_everybody
+groupadd -g 9998 aid_misc
+groupadd -g 9999 aid_nobody
+groupadd -g 10000 aid_app_start
+groupadd -g 19999 aid_app_end
+groupadd -g 20000 aid_cache_gid_start
+groupadd -g 29999 aid_cache_gid_end
+groupadd -g 30000 aid_ext_gid_start
+groupadd -g 39999 aid_ext_gid_end
+groupadd -g 40000 aid_ext_cache_gid_start
+groupadd -g 49999 aid_ext_cache_gid_end
+groupadd -g 50000 aid_shared_gid_start
+groupadd -g 59999 aid_shared_gid_end
+groupadd -g 99000 aid_isolated_start
+groupadd -g 99999 aid_isolated_end
+groupadd -g 100000 aid_user_offset
+usermod -a -G aid_system,aid_radio,aid_bluetooth,aid_graphics,aid_input,aid_audio,aid_camera,aid_log,aid_compass,aid_mount,aid_wifi,aid_adb,aid_install,aid_media,aid_dhcp,aid_sdcard_rw,aid_vpn,aid_keystore,aid_usb,aid_drm,aid_mdnsr,aid_gps,aid_media_rw,aid_mtp,aid_drmrpc,aid_nfc,aid_sdcard_r,aid_clat,aid_loop_radio,aid_media_drm,aid_package_info,aid_sdcard_pics,aid_sdcard_av,aid_sdcard_all,aid_logd,aid_shared_relro,aid_dbus,aid_tlsdate,aid_media_ex,aid_audioserver,aid_metrics_coll,aid_metricsd,aid_webserv,aid_debuggerd,aid_media_codec,aid_cameraserver,aid_firewall,aid_trunks,aid_nvram,aid_dns,aid_dns_tether,aid_webview_zygote,aid_vehicle_network,aid_media_audio,aid_media_video,aid_media_image,aid_tombstoned,aid_media_obb,aid_ese,aid_ota_update,aid_automotive_evs,aid_lowpan,aid_hsm,aid_reserved_disk,aid_statsd,aid_incidentd,aid_secure_element,aid_lmkd,aid_llkd,aid_iorapd,aid_gpu_service,aid_network_stack,aid_shell,aid_cache,aid_diag,aid_oem_reserved_start,aid_oem_reserved_end,aid_net_bt_admin,aid_net_bt,aid_inet,aid_net_raw,aid_net_admin,aid_net_bw_stats,aid_net_bw_acct,aid_readproc,aid_wakelock,aid_uhid,aid_everybody,aid_misc,aid_nobody,aid_app_start,aid_app_end,aid_cache_gid_start,aid_cache_gid_end,aid_ext_gid_start,aid_ext_gid_end,aid_ext_cache_gid_start,aid_ext_cache_gid_end,aid_shared_gid_start,aid_shared_gid_end,aid_isolated_start,aid_isolated_end,aid_user_offset root 2>/dev/null
+usermod -g aid_inet _apt 2>/dev/null
+echo "root:${PASSWORD}" | chpasswd
+yum update -y
+yum install -y openssh-server
+yum clean all
+sed -i 's/^#PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i 's/^#PasswordAuthentication/PasswordAuthentication/' /etc/ssh/sshd_config
+sed -i 's/^UsePAM yes/UsePAM no/' /etc/ssh/sshd_config
+sed -i "s/^#Port 22/Port ${PORT}/" /etc/ssh/sshd_config
+ln -s /usr/local/lib/servicectl/serviced /usr/bin/serviced
+ln -s /usr/local/lib/servicectl/servicectl /usr/bin/servicectl
+ssh-keygen -A