Merge pull request #10 from lin1328/main

Add Fedora and Kali

Author: Moe-hacker

.github/workflows/build.yml

@@ -80,7 +80,8 @@ jobs:
           container_zip "alpine" "edge"
           container_zip "centos" "9-Stream"
           container_zip "debian" "bookworm"
-          container_zip "ubuntu" "jammy"
+          container_zip "fedora" "41"
+          container_zip "kali" "current"
           container_zip "ubuntu" "oracular"
 
       - name: Release

README.md

@@ -17,6 +17,12 @@
   - bullseye
   - buster
   - trixie
+- fedora
+  - 39
+  - 40
+  - `41`
+- kali
+  - `current`
 - ubuntu
   - focal
   - `jammy`

bate.sh

@@ -10,7 +10,7 @@ fi
 MODULEID="asl"
 BASE_DIR="/data"
 BACKUP_DIR="/data"
-OS_LIST=("ubuntu" "debian" "archlinux" "alpine" "centos")
+OS_LIST=("ubuntu" "debian" "archlinux" "alpine" "centos" "fedora" "kali")
 
 echoRgb() {
     local message="$1"

config.conf

@@ -4,6 +4,7 @@
 # Mirror
 RURIMA_LXC_MIRROR=images.linuxcontainers.org
 RURIMA_LXC_MIRROR_FALLBACK=mirrors.tuna.tsinghua.edu.cn/lxc-images
+
 # OS to install
 # Make sure there is setup/${RURIMA_LXC_OS}.sh
 RURIMA_LXC_OS=ubuntu

container_ctrl.sh

@@ -3,18 +3,18 @@
 init_setup() {
     MODDIR=${0%/*}
     export PATH="$MODDIR/bin:$PATH"
-    . "$MODDIR"/config.conf
+    . "$MODDIR/config.conf"
 }
 
 ruriumount() {
     init_setup
     fuser -k "$CONTAINER_DIR" >/dev/null 2>&1
     ruri -U "$CONTAINER_DIR" >/dev/null 2>&1
     umount -lvf "$CONTAINER_DIR" 2>/dev/null
-    umount -lf "$CONTAINER_DIR"/sdcard 2>/dev/null
-    umount -lf "$CONTAINER_DIR"/sys 2>/dev/null
-    umount -lf "$CONTAINER_DIR"/proc 2>/dev/null
-    umount -lf "$CONTAINER_DIR"/dev 2>/dev/null
+    umount -lf "$CONTAINER_DIR/sdcard" 2>/dev/null
+    umount -lf "$CONTAINER_DIR/sys" 2>/dev/null
+    umount -lf "$CONTAINER_DIR/proc" 2>/dev/null
+    umount -lf "$CONTAINER_DIR/dev" 2>/dev/null
     echo "- Container stopped"
     sleep 2
 }
@@ -25,10 +25,10 @@ ruristart() {
     # 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
-        archlinux|centos)
+        archlinux|centos|fedora)
             START_SERVICES="servicectl start sshd"
             ;;
-        debian|ubuntu)
+        debian|kali|ubuntu)
             START_SERVICES="service ssh start"
             ;;
         alpine)

customize.sh

@@ -104,11 +104,12 @@ automatic() {
         ui_print "- Download failed. Attempting to download the root filesystem using the fallback source ${RURIMA_LXC_MIRROR_FALLBACK}..."
         rurima lxc pull -n -m ${RURIMA_LXC_MIRROR_FALLBACK} -o ${RURIMA_LXC_OS} -v ${RURIMA_LXC_OS_VERSION} -s "$CONTAINER_DIR"
     fi
+
     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 2
-    getprop ro.product.model >"$CONTAINER_DIR/etc/hostname"
+    getprop ro.product.model > "$CONTAINER_DIR/etc/hostname"
     mkdir -p "$CONTAINER_DIR/tmp" "$CONTAINER_DIR/usr/local/lib/servicectl/enabled"
     cp "$MODPATH/setup/setup.sh" "$CONTAINER_DIR/tmp/setup.sh"
     cp -r "$MODPATH/setup/servicectl"/* "$CONTAINER_DIR/usr/local/lib/servicectl/"
@@ -117,7 +118,7 @@ automatic() {
     ruri "$CONTAINER_DIR" /bin/sh /tmp/setup.sh "$RURIMA_LXC_OS" "$PASSWORD" "$PORT"
 
     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!"
 }

module.prop

@@ -2,5 +2,5 @@ id=asl
 name=Android Subsystem for GNU/Linux
 version=v1.0.0
 versionCode=202412
-author=Moe-hacker,Lin1328
+author=Moe-hacker & Lin1328
 description=Android Subsystem for GNU/Linux Powered by ruri