Skip to content

Commit 2d91d38

Browse files
author
MochiOS Team
committed
fix: remove nonexistent /root entries from profiledef.sh file_permissions (caused mkarchiso exit 1)
1 parent 95b8efb commit 2d91d38

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎archiso-mochios/profiledef.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size'
1515
bootstrap_tarball_compression=('zstd' '-c' '-T0' '--auto-threads=logical' '--long' '-19')
1616
file_permissions=(
1717
["/etc/shadow"]="0:0:400"
18-
["/root"]="0:0:750"
19-
["/root/.automated_script.sh"]="0:0:755"
2018
["/usr/local/bin/mochiinstall"]="0:0:755"
2119
)

‎build.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ mkdir -p "$ISO_DIR/airootfs/opt/mochi-pkgs"
7272
for pkg in mochi; do
7373
cp "$REPO_DIR/os/x86_64/"$pkg-[0-9]*.pkg.tar.zst "$ISO_DIR/airootfs/opt/mochi-pkgs/"
7474
done
75+
# also copy the repo database so pacman can resolve the custom repo in the chroot
76+
cp -L "$REPO_DIR/os/x86_64/mochi.db" "$ISO_DIR/airootfs/opt/mochi-pkgs/mochi.db" 2>/dev/null || true
7577

7678
echo "==> stamping build date into mochios-release..."
7779
BUILD_DATE=$(date +%Y-%m-%d)

0 commit comments

Comments
 (0)