summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/busybox/config/networking/Config.in1
-rwxr-xr-xscripts/install.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index cdc765d97..a2475a161 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -761,6 +761,7 @@ config BUSYBOX_NTPD
config BUSYBOX_FEATURE_NTPD_SERVER
bool "Make ntpd usable as a NTP server"
default n
+ depends on !BUSYBOX_DISABLE_NTPD
depends on BUSYBOX_NTPD
help
Make ntpd usable as a NTP server. If you disable this option
diff --git a/scripts/install.sh b/scripts/install.sh
index 0cdc43fa8..802a74a66 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -511,7 +511,7 @@ case $target {
(( quiet )) || print Extracting installation archive...
mount_fs "$rootpart" "$R" ext4
-xz -d "$src" | (cd "$R"; tar -xpf -)
+xz -dc "$src" | (cd "$R"; tar -xpf -)
if (( datafssz )); then
mkdir -m0755 "$R"/data
@@ -525,7 +525,7 @@ if (( datafssz )); then
echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >> "$R"/etc/fstab
;;
(solidrun-imx6)
- echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >> "$R"/etc/fstab
+ echo "/dev/mmcblk0p2 /data ext4 rw 0 0" >> "$R"/etc/fstab
;;
}
fi