From a5929a2bfa8b1ea4e92e4693acfdfdb005e9df65 Mon Sep 17 00:00:00 2001 From: lin1328 Date: Sun, 22 Dec 2024 09:09:53 +0800 Subject: [PATCH] Add Fedora and Kali --- .github/workflows/build.yml | 3 +- README.md | 6 ++ bate.sh | 2 +- config.conf | 1 + container_ctrl.sh | 14 ++-- customize.sh | 5 +- module.prop | 2 +- setup/alpine.sh | 26 ------ setup/archlinux.sh | 161 ------------------------------------ setup/centos.sh | 121 --------------------------- setup/debian.sh | 122 --------------------------- setup/setup.sh | 55 ++++++++++-- setup/ubuntu.sh | 122 --------------------------- uninstall.sh | 10 +-- 14 files changed, 75 insertions(+), 575 deletions(-) delete mode 100755 setup/alpine.sh delete mode 100755 setup/archlinux.sh delete mode 100755 setup/centos.sh delete mode 100644 setup/debian.sh delete mode 100644 setup/ubuntu.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40c3087..17f0f9a 100755 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/README.md b/README.md index 3eed258..d50e3a7 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ - bullseye - buster - trixie +- fedora + - 39 + - 40 + - `41` +- kali + - `current` - ubuntu - focal - `jammy` diff --git a/bate.sh b/bate.sh index 3b3ae41..20b3542 100755 --- a/bate.sh +++ b/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" diff --git a/config.conf b/config.conf index 8ebf576..238ed17 100644 --- a/config.conf +++ b/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 diff --git a/container_ctrl.sh b/container_ctrl.sh index a3b1806..96ef508 100644 --- a/container_ctrl.sh +++ b/container_ctrl.sh @@ -3,7 +3,7 @@ init_setup() { MODDIR=${0%/*} export PATH="$MODDIR/bin:$PATH" - . "$MODDIR"/config.conf + . "$MODDIR/config.conf" } ruriumount() { @@ -11,10 +11,10 @@ ruriumount() { 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) diff --git a/customize.sh b/customize.sh index 343e01c..753425f 100644 --- a/customize.sh +++ b/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!" } diff --git a/module.prop b/module.prop index bd3e7dd..5b24439 100644 --- a/module.prop +++ b/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 diff --git a/setup/alpine.sh b/setup/alpine.sh deleted file mode 100755 index e3d3e38..0000000 --- a/setup/alpine.sh +++ /dev/null @@ -1,26 +0,0 @@ -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 1003 aid_graphics -groupadd -g 3003 aid_inet -groupadd -g 3004 aid_net_raw -usermod -aG video,audio,storage,aid_graphics,aid_inet,aid_net_raw root -usermod -g aid_inet _apt 2>/dev/null -usermod -a -G aid_inet,aid_net_raw portage 2>/dev/null -echo "root:${PASSWORD}" | chpasswd -apk update -apk add openrc openssh -mkdir -p /run/openrc -touch /run/openrc/softlevel -openrc -rc-service devfs start -rc-service dmesg start -rc-update add sshd -rc-update add resolvconf default -sed -i 's/^#PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config -grep -q "^#*PasswordAuthentication" /etc/ssh/sshd_config || echo "PasswordAuthentication 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 ${PORT}/" /etc/ssh/sshd_config diff --git a/setup/archlinux.sh b/setup/archlinux.sh deleted file mode 100755 index 2628378..0000000 --- a/setup/archlinux.sh +++ /dev/null @@ -1,161 +0,0 @@ -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 -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 -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 -echo "root:${PASSWORD}" | chpasswd -sed -i "/^CheckSpace/s/^/#/" /etc/pacman.conf -sed -i "/^#IgnorePkg/a\IgnorePkg = linux-aarch64 linux-firmware" /etc/pacman.conf -cat > /etc/pacman.d/mirrorlist <<-'EndOfArchMirrors' -## Archlinux arm -Server = http://mirror.archlinuxarm.org/$arch/$repo -## Server = https://mirrors.ustc.edu.cn/archlinuxarm/$arch/$repo -## Server = https://mirrors.bfsu.edu.cn/archlinuxarm/$arch/$repo -## Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxarm/$arch/$repo -## Server = https://mirrors.163.com/archlinuxarm/$arch/$repo -EndOfArchMirrors -cat >>/etc/pacman.conf <<-'Endofpacman1' -[arch4edu] -Server = https://mirrors.bfsu.edu.cn/arch4edu/$arch -Server = https://mirrors.tuna.tsinghua.edu.cn/arch4edu/$arch -Server = https://mirror.autisten.club/arch4edu/$arch -Server = https://arch4edu.keybase.pub/$arch -Server = https://mirror.lesviallon.fr/arch4edu/$arch -Server = https://mirrors.tencent.com/arch4edu/$arch -SigLevel = Never -Endofpacman1 -cat >>/etc/pacman.conf <<-'Endofpacman2' -[archlinuxcn] -Server = https://mirrors.bfsu.edu.cn/archlinuxcn/$arch -Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch -Server = https://repo.archlinuxcn.org/$arch -SigLevel = Never -Endofpacman2 -pacman-key --init -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 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 "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 -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 diff --git a/setup/centos.sh b/setup/centos.sh deleted file mode 100755 index ca17441..0000000 --- a/setup/centos.sh +++ /dev/null @@ -1,121 +0,0 @@ -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 diff --git a/setup/debian.sh b/setup/debian.sh deleted file mode 100644 index bbc1b47..0000000 --- a/setup/debian.sh +++ /dev/null @@ -1,122 +0,0 @@ -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 -usermod -a -G aid_inet,aid_net_raw portage 2>/dev/null -echo "root:${PASSWORD}" | chpasswd -export DEBIAN_FRONTEND=noninteractive -apt update -apt install -y openssh-server -apt autoclean -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 -sed -i "s/\$PORT/${PORT}/g" /etc/ssh/sshd_config -# sed -i '/^#.*%wheel ALL=(ALL) ALL/ s/^#//' /etc/sudoers diff --git a/setup/setup.sh b/setup/setup.sh index 7047cef..937d170 100644 --- a/setup/setup.sh +++ b/setup/setup.sh @@ -219,16 +219,53 @@ setup_debian() { apt autoclean } +setup_fedora() { + dnf update -y + dnf install -y openssh-server + dnf clean all + + ln -s /usr/local/lib/servicectl/serviced /usr/bin/serviced + ln -s /usr/local/lib/servicectl/servicectl /usr/bin/servicectl + + ssh-keygen -A +} + +setup_kali() { + apt update + apt install -y openssh-server + apt autoclean + + # apt install kali-tools-top10 + # apt install kali-linux-all +} + configure_ssh() { local port=${PORT:-22} - sed -i 's/^#*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config - grep -q "^#*PasswordAuthentication" /etc/ssh/sshd_config || echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config - sed -i 's/^#*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config - sed -i "s/^#*Port .*/Port ${port}/" /etc/ssh/sshd_config - sed -i 's/^UsePAM yes/UsePAM no/' /etc/ssh/sshd_config -} + if grep -Eq "^#?\s*PermitRootLogin" /etc/ssh/sshd_config; then + sed -i 's/^#\?\s*PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config + else + echo "PermitRootLogin yes" >> /etc/ssh/sshd_config + fi + if grep -Eq "^#?\s*PasswordAuthentication" /etc/ssh/sshd_config; then + sed -i 's/^#\?\s*PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config + else + echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config + fi + + if grep -Eq "^#?\s*Port" /etc/ssh/sshd_config; then + sed -i "s/^#\?\s*Port .*/Port ${port}/" /etc/ssh/sshd_config + else + echo "Port ${port}" >> /etc/ssh/sshd_config + fi + + if grep -Eq "^#?\s*UsePAM" /etc/ssh/sshd_config; then + sed -i 's/^#\?\s*UsePAM.*/UsePAM no/' /etc/ssh/sshd_config + else + echo "UsePAM no" >> /etc/ssh/sshd_config + fi +} main() { configure_dns_host @@ -252,6 +289,12 @@ main() { debian|ubuntu) setup_debian ;; + fedora) + setup_fedora + ;; + kali) + setup_kali + ;; *) echo "Unsupported LXC OS: $LXC_OS" ;; diff --git a/setup/ubuntu.sh b/setup/ubuntu.sh deleted file mode 100644 index bbc1b47..0000000 --- a/setup/ubuntu.sh +++ /dev/null @@ -1,122 +0,0 @@ -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 -usermod -a -G aid_inet,aid_net_raw portage 2>/dev/null -echo "root:${PASSWORD}" | chpasswd -export DEBIAN_FRONTEND=noninteractive -apt update -apt install -y openssh-server -apt autoclean -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 -sed -i "s/\$PORT/${PORT}/g" /etc/ssh/sshd_config -# sed -i '/^#.*%wheel ALL=(ALL) ALL/ s/^#//' /etc/sudoers diff --git a/uninstall.sh b/uninstall.sh index e820e1b..856bd47 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,12 +1,12 @@ MODDIR=${0%/*} -"$MODDIR"/container_ctrl.sh stop +"$MODDIR/container_ctrl.sh" stop CONTAINER_DIR=$(grep '^CONTAINER_DIR=' "$MODDIR/config.conf" | cut -d '=' -f 2) rm -f /data/adb/service.d/inotify.sh -umount -lf "$CONTAINER_DIR"/dev -umount -lf "$CONTAINER_DIR"/proc -umount -lf "$CONTAINER_DIR"/sys -umount -lf "$CONTAINER_DIR"/sdcard +umount -lf "$CONTAINER_DIR/dev" +umount -lf "$CONTAINER_DIR/proc" +umount -lf "$CONTAINER_DIR/sys" +umount -lf "$CONTAINER_DIR/sdcard" rm -rf "$CONTAINER_DIR" rm -rf "$CONTAINER_DIR.old" version=1