diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.sh | 6 | ||||
| -rw-r--r-- | scripts/ipkg | 37 |
2 files changed, 23 insertions, 20 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 016e35746..2304a9eb9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -165,7 +165,7 @@ case $ostype { part=${basedev}s1 match=\'${basedev}\''?(s+([0-9]))' function mount_ext2fs { - fuse-ext2 "$1" "$2" -o force + fuse-ext2 "$1" "$2" -o rw+ sleep 3 } ;; @@ -336,7 +336,7 @@ tune2fs -c 0 -i 0 "$part" (( quiet )) || print Extracting installation archive... mount_ext2fs "$part" "$T" -gzip -dc "$src" | (cd "$T"; tar -xpf -) +gzip -dc "$src" | (cd "$T"; tar -xvpf -) cd "$T" rnddev=/dev/urandom [[ -c /dev/arandom ]] && rnddev=/dev/arandom @@ -345,6 +345,8 @@ dd if=$rnddev bs=16 count=1 >>etc/.rnd 2>/dev/null chown 0:0 tmp chmod 1777 tmp chmod 4755 bin/busybox +[[ -f usr/bin/Xorg ]] && chmod 4755 usr/bin/Xorg +[[ -f usr/bin/sudo ]] && chmod 4755 usr/bin/sudo (( quiet )) || print Configuring GRUB2 bootloader... mkdir -p boot/grub ( diff --git a/scripts/ipkg b/scripts/ipkg index cfa1cfe97..101d20dc1 100644 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -11,6 +11,7 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. +#set -x set -e @@ -752,26 +753,26 @@ ipkg_install_file_dest() { fi # Check dependencies - local depends="`ipkg_depends $pkg | sed -e "s/\<$pkg\>//"`" + #local depends="`ipkg_depends $pkg | sed -e "s/\<$pkg\>//"`" # Don't worry about deps that are scheduled for installation - local missing_deps= - for dep in $depends; do - if ! ipkg_status_all $dep | grep -q 'Status:[[:space:]]install'; then - missing_deps="$missing_deps $dep" - fi - done - - if [ ! -z "$missing_deps" ]; then - if [ -n "$FORCE_DEPENDS" ]; then - echo "ipkg_install_file: Warning: $pkg depends on the following uninstalled programs: $missing_deps" - else - echo "ipkg_install_file: ERROR: $pkg depends on the following uninstalled programs: - $missing_deps" - echo "ipkg_install_file: You may want to use \`ipkg install' to install these." - return 1 - fi - fi + #local missing_deps= + #for dep in $depends; do + # if ! ipkg_status_all $dep | grep -q 'Status:[[:space:]]install'; then + # missing_deps="$missing_deps $dep" + # fi + #done + + #if [ ! -z "$missing_deps" ]; then + # if [ -n "$FORCE_DEPENDS" ]; then + # echo "ipkg_install_file: Warning: $pkg depends on the following uninstalled programs: $missing_deps" + # else + # echo "ipkg_install_file: ERROR: $pkg depends on the following uninstalled programs: + #$missing_deps" + # echo "ipkg_install_file: You may want to use \`ipkg install' to install these." + # return 1 + # fi + #fi mkdir -p $IPKG_TMP/$pkg/control mkdir -p $IPKG_TMP/$pkg/data |