From d1b910dd4e80a8fb05d5a598a9e57d54d17f96e3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Aug 2013 13:08:00 +0300 Subject: [PATCH 1/5] udisks: fix mount-disks --- packages/sysutils/udisks/init.d/31_mount-disks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/udisks/init.d/31_mount-disks b/packages/sysutils/udisks/init.d/31_mount-disks index 3aae41f310..a16d4cc89b 100644 --- a/packages/sysutils/udisks/init.d/31_mount-disks +++ b/packages/sysutils/udisks/init.d/31_mount-disks @@ -28,7 +28,7 @@ wait_for_dbus - for DEVICE in `find /sys/class/block/sd*/removable > /dev/null 2>&1`; do + for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do if [ "$(cat $DEVICE)" = "0" ]; then DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,") for PART in $(ls "$DISK"[0-9]*);do From 2bc7251c7c79553e3f1c8bc7d71ca22e07e572d6 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Aug 2013 13:35:41 +0300 Subject: [PATCH 2/5] udisks: fix mount-disks --- packages/sysutils/udisks/scripts/udisks-mount-disks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/udisks/scripts/udisks-mount-disks b/packages/sysutils/udisks/scripts/udisks-mount-disks index 6dd35e4f7a..2845e9617e 100755 --- a/packages/sysutils/udisks/scripts/udisks-mount-disks +++ b/packages/sysutils/udisks/scripts/udisks-mount-disks @@ -21,11 +21,11 @@ # automount internal disks -for DEVICE in `find /sys/class/block/sd*/removable > /dev/null 2>&1`; do +for DEVICE in `ls /sys/class/block/sd*/removable 2>/dev/null`; do if [ "$(cat $DEVICE)" = "0" ]; then DISK=$(echo "$DEVICE" | sed -e "s,/sys/class/block,/dev," -e "s,/removable,,") for PART in $(ls "$DISK"[0-9]*);do udisks --mount "$PART" >/dev/null done fi -done \ No newline at end of file +done From 019f1f8f77e1a9d6eac3290ce9f8385e6a01ea69 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Aug 2013 18:12:56 +0300 Subject: [PATCH 3/5] avahi: cleanup --- packages/network/avahi/package.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk index c7e04fb006..495d8c40b6 100644 --- a/packages/network/avahi/package.mk +++ b/packages/network/avahi/package.mk @@ -85,6 +85,12 @@ post_makeinstall_target() { sed -e "s,^.*disallow-other-stacks=.*$,disallow-other-stacks=yes,g" -i $INSTALL/etc/avahi/avahi-daemon.conf # disable wide-area sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf +# publish-hinfo + sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf +# publish-workstation + sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf +# browse domains? + sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf rm -rf $INSTALL/etc/avahi/avahi-autoipd.action rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action @@ -93,6 +99,12 @@ post_makeinstall_target() { rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service fi rm -rf $INSTALL/lib/systemd + rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service + rm -f $INSTALL/usr/sbin/avahi-autoipd + rm -f $INSTALL/usr/sbin/avahi-dnsconfd + rm -f $INSTALL/usr/bin/avahi-bookmarks + rm -f $INSTALL/usr/bin/avahi-publish* + rm -f $INSTALL/usr/bin/avahi-resolve* } post_install() { From 9fb174b66af189d7ce9c40464d6ca789ac8d00f7 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Aug 2013 18:14:20 +0300 Subject: [PATCH 4/5] open-iscsi: update to open-iscsi-bf39941 --- packages/initramfs/sysutils/open-iscsi/meta | 2 +- ...tart.patch => open-iscsi-01_dynamic_linked_iscsistart.patch} | 0 ...02-cross_compile.patch => open-iscsi-02-cross_compile.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/initramfs/sysutils/open-iscsi/patches/{open-iscsi-ae94266_01_dynamic_linked_iscsistart.patch => open-iscsi-01_dynamic_linked_iscsistart.patch} (100%) rename packages/initramfs/sysutils/open-iscsi/patches/{open-iscsi-ae94266_02-cross_compile.patch => open-iscsi-02-cross_compile.patch} (100%) diff --git a/packages/initramfs/sysutils/open-iscsi/meta b/packages/initramfs/sysutils/open-iscsi/meta index a005707977..4386ef059e 100644 --- a/packages/initramfs/sysutils/open-iscsi/meta +++ b/packages/initramfs/sysutils/open-iscsi/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="open-iscsi" -PKG_VERSION="ae94266" +PKG_VERSION="bf39941" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_01_dynamic_linked_iscsistart.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_01_dynamic_linked_iscsistart.patch rename to packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-01_dynamic_linked_iscsistart.patch diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_02-cross_compile.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch similarity index 100% rename from packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-ae94266_02-cross_compile.patch rename to packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-02-cross_compile.patch From 12adb7c3ae6a13ccd672c6a1eed39bb91905f407 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 8 Aug 2013 18:14:38 +0300 Subject: [PATCH 5/5] open-iscsi: add patch to enable multicast --- .../open-iscsi-03_enable-multicast.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch diff --git a/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch new file mode 100644 index 0000000000..10ca6e23ef --- /dev/null +++ b/packages/initramfs/sysutils/open-iscsi/patches/open-iscsi-03_enable-multicast.patch @@ -0,0 +1,26 @@ +From d5b4400d2c50190474a6000d60f05deb95f97e0b Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Thu, 8 Aug 2013 18:08:44 +0300 +Subject: [PATCH] enable multicast + +source: https://groups.google.com/forum/#!msg/open-iscsi/nuLFqxgsHAA/53-JE3gNNjEJ +--- + usr/iscsi_net_util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/iscsi_net_util.c b/usr/iscsi_net_util.c +index 6d0ebf9..3801ac7 100644 +--- a/usr/iscsi_net_util.c ++++ b/usr/iscsi_net_util.c +@@ -229,7 +229,7 @@ int net_setup_netdev(char *netdev, char *local_ip, char *mask, char *gateway, + /* Bring up interface */ + memset(&ifr, 0, sizeof(ifr)); + strlcpy(ifr.ifr_name, netdev, IFNAMSIZ); +- ifr.ifr_flags = IFF_UP | IFF_RUNNING; ++ ifr.ifr_flags = IFF_UP | IFF_RUNNING | IFF_MULTICAST; + if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0) { + log_error("Could not bring up netdev %s (err %d - %s)", + netdev, errno, strerror(errno)); +-- +1.8.1.2 +