# HG changeset patch # User Pascal Bellard # Date 1450949454 -3600 # Node ID 967cede25fb46465a88aba9f402afab0bb481761 # Parent eecec1b9437aeed52d1e8779ec58da9773bb0d92 ldd: use $PATH diff -r eecec1b9437a -r 967cede25fb4 rootfs/etc/fstab --- a/rootfs/etc/fstab Wed Dec 23 22:02:35 2015 +0100 +++ b/rootfs/etc/fstab Thu Dec 24 10:30:54 2015 +0100 @@ -3,7 +3,7 @@ proc /proc proc defaults 0 0 sysfs /sys sysfs defaults 0 0 devpts /dev/pts devpts rw,gid=5,mode=0620 0 0 -tmpfs /dev/shm tmpfs defaults 0 0 +tmpfs /dev/shm tmpfs noexec,nosuid 0 0 tmpfs /var/lock tmpfs defaults 0 0 /dev/cdrom /media/cdrom iso9660 user,ro,noauto 0 0 #/dev/sda3 /home ext3 defaults 0 2 diff -r eecec1b9437a -r 967cede25fb4 rootfs/usr/bin/ipinfo --- a/rootfs/usr/bin/ipinfo Wed Dec 23 22:02:35 2015 +0100 +++ b/rootfs/usr/bin/ipinfo Thu Dec 24 10:30:54 2015 +0100 @@ -10,6 +10,6 @@ iface="$INTERFACE" fi -ifconfig ${iface} | fgrep 'inet addr:' | cut -d: -f2 | awk '{print $1}' +ifconfig ${iface} | awk '/inet addr/{print substr($1,6)}' exit 0 diff -r eecec1b9437a -r 967cede25fb4 rootfs/usr/bin/ldd --- a/rootfs/usr/bin/ldd Wed Dec 23 22:02:35 2015 +0100 +++ b/rootfs/usr/bin/ldd Thu Dec 24 10:30:54 2015 +0100 @@ -1,17 +1,17 @@ #!/bin/sh # # Tiny ldd fake. -# Copyright (C) 2010-2014 SliTaz GNU/Linux. +# Copyright (C) 2010-2015 SliTaz GNU/Linux. # -echo "" +echo file="$@" for file do - case $file in - */*) : ;; - *) file=./$file ;; + case "$file" in + */*) ;; + *) [ -f "./$file" ] && file="./$file" esac - echo "$file:" | sed 's%^./%%' - LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so "$file" - echo "" + which "$file" | sed 's%^./%%;s%$%:%' + LD_TRACE_LOADED_OBJECTS=1 "$file" + echo done