fix something

This commit is contained in:
Ing 2024-03-19 16:13:57 +08:00
parent e21e5963a2
commit 0d20249763
3 changed files with 40 additions and 38 deletions

View File

@ -1,6 +1,6 @@
<img src="https://avatars.githubusercontent.com/u/151816514?s=200&v=4" alt="logo" width="140" height="140" align="left" />
<h1>RR: <small>Yet a Better Redistributed Fork of ARPL for Redpill Bootload Automation</small></h1>
<h1>RR: <small>redpills preinstallation and recovery environment</small></h1>
> The ultimate solution to self-centralized Synology DSM OS on any local machine with any x86/x64 CPU architecture via a single flash of bootload pre-installation process in addition within recovery environment.

View File

@ -31,7 +31,7 @@ function init() {
fi
sudo apt update
sudo apt install -y locales busybox dialog
sudo apt install -y locales busybox dialog curl xz cpio sed
sudo locale-gen en_US.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
YQ=$(command -v yq)
@ -43,35 +43,35 @@ function init() {
sudo losetup -P "${LOOPX}" "${RRIMGPATH}"
echo "Mounting image file"
rm -rf "/tmp/p1"
rm -rf "/tmp/p2"
rm -rf "/tmp/p3"
mkdir -p "/tmp/p1"
mkdir -p "/tmp/p2"
mkdir -p "/tmp/p3"
sudo mount ${LOOPX}p1 "/tmp/p1"
sudo mount ${LOOPX}p2 "/tmp/p2"
sudo mount ${LOOPX}p3 "/tmp/p3"
rm -rf "/tmp/mnt/p1"
rm -rf "/tmp/mnt/p2"
rm -rf "/tmp/mnt/p3"
mkdir -p "/tmp/mnt/p1"
mkdir -p "/tmp/mnt/p2"
mkdir -p "/tmp/mnt/p3"
sudo mount ${LOOPX}p1 "/tmp/mnt/p1"
sudo mount ${LOOPX}p2 "/tmp/mnt/p2"
sudo mount ${LOOPX}p3 "/tmp/mnt/p3"
echo "Create WORKSPACE"
rm -rf "${WORKSPACE}"
mkdir -p "${WORKSPACE}/mnt"
mkdir -p "${WORKSPACE}/tmp"
mkdir -p "${WORKSPACE}/initrd"
cp -rf "/tmp/p1" "${WORKSPACE}/mnt/p1"
cp -rf "/tmp/p2" "${WORKSPACE}/mnt/p2"
cp -rf "/tmp/p3" "${WORKSPACE}/mnt/p3"
cp -rf "/tmp/mnt/p1" "${WORKSPACE}/mnt/p1"
cp -rf "/tmp/mnt/p2" "${WORKSPACE}/mnt/p2"
cp -rf "/tmp/mnt/p3" "${WORKSPACE}/mnt/p3"
(
cd "${WORKSPACE}/initrd"
xz -dc <"${WORKSPACE}/mnt/p3/initrd-rr" | cpio -idm
) 2>/dev/null
sudo sync
sudo umount "/tmp/p1"
sudo umount "/tmp/p2"
sudo umount "/tmp/p3"
rm -rf "/tmp/p1"
rm -rf "/tmp/p2"
rm -rf "/tmp/p3"
sudo umount "/tmp/mnt/p1"
sudo umount "/tmp/mnt/p2"
sudo umount "/tmp/mnt/p3"
rm -rf "/tmp/mnt/p1"
rm -rf "/tmp/mnt/p2"
rm -rf "/tmp/mnt/p3"
sudo losetup --detach ${LOOPX}
rm -f $(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)/rr.env
@ -110,27 +110,28 @@ function pack() {
sudo losetup -P "${LOOPX}" "${RRIMGPATH}"
echo "Mounting image file"
rm -rf "/tmp/p1"
rm -rf "/tmp/p2"
rm -rf "/tmp/p3"
mkdir -p "/tmp/p1"
mkdir -p "/tmp/p2"
mkdir -p "/tmp/p3"
sudo mount ${LOOPX}p1 "/tmp/p1"
sudo mount ${LOOPX}p2 "/tmp/p2"
sudo mount ${LOOPX}p3 "/tmp/p3"
rm -rf "/tmp/mnt/p1"
rm -rf "/tmp/mnt/p2"
rm -rf "/tmp/mnt/p3"
mkdir -p "/tmp/mnt/p1"
mkdir -p "/tmp/mnt/p2"
mkdir -p "/tmp/mnt/p3"
sudo mount ${LOOPX}p1 "/tmp/mnt/p1"
sudo mount ${LOOPX}p2 "/tmp/mnt/p2"
sudo mount ${LOOPX}p3 "/tmp/mnt/p3"
echo "Pack image file"
cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/p1"
cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/p2"
cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/p3"
cp -af "${CHROOT_PATH}/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
cp -rf "${CHROOT_PATH}/mnt/p1/"* "/tmp/mnt/p1"
cp -rf "${CHROOT_PATH}/mnt/p2/"* "/tmp/mnt/p2"
cp -rf "${CHROOT_PATH}/mnt/p3/"* "/tmp/mnt/p3"
sudo sync
sudo umount "/tmp/p1"
sudo umount "/tmp/p2"
sudo umount "/tmp/p3"
rm -rf "/tmp/p1"
rm -rf "/tmp/p2"
rm -rf "/tmp/p3"
sudo umount "/tmp/mnt/p1"
sudo umount "/tmp/mnt/p2"
sudo umount "/tmp/mnt/p3"
rm -rf "/tmp/mnt/p1"
rm -rf "/tmp/mnt/p2"
rm -rf "/tmp/mnt/p3"
sudo losetup --detach ${LOOPX}
echo "OK."
}

View File

@ -70,6 +70,7 @@ sudo mount ${LOOPX}p3 "/tmp/mnt/p3"
echo "Copying files"
sudo cp -af "files/mnt/p1/.locale" "/tmp/mnt/p1" 2>/dev/null
sudo cp -Rf "files/mnt/p1/"* "/tmp/mnt/p1"
sudo cp -Rf "files/mnt/p2/"* "/tmp/mnt/p2"
sudo cp -Rf "files/mnt/p3/"* "/tmp/mnt/p3"