wok-next annotate gparted/stuff/patches/busybox-compatible.patch @ rev 21087
Updates...
Revert names: libsdl -> sdl, libsmpeg -> smpeg, libtdb -> tdb
Revert names: libsdl -> sdl, libsmpeg -> smpeg, libtdb -> tdb
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Dec 28 05:11:49 2018 +0200 (2018-12-28) |
parents | 400dfee62496 |
children |
rev | line source |
---|---|
al@21050 | 1 --- a/src/Win_GParted.cc |
al@21050 | 2 +++ b/src/Win_GParted.cc |
al@21087 | 3 @@ -2775,12 +2775,12 @@ |
al@21050 | 4 switch ( action ) |
al@21050 | 5 { |
al@21050 | 6 case SWAPOFF: |
al@21050 | 7 - cmd = "swapoff -v " + Glib::shell_quote( filesystem_ptn.get_path() ); |
al@21050 | 8 + cmd = "swapoff " + Glib::shell_quote( filesystem_ptn.get_path() ); |
al@21050 | 9 success = ! Utils::execute_command( cmd, output, error ); |
al@21050 | 10 error_msg = "<i># " + cmd + "\n" + error + "</i>"; |
al@21050 | 11 break; |
al@21050 | 12 case SWAPON: |
al@21050 | 13 - cmd = "swapon -v " + Glib::shell_quote( filesystem_ptn.get_path() ); |
al@21050 | 14 + cmd = "swapon " + Glib::shell_quote( filesystem_ptn.get_path() ); |
al@21050 | 15 success = ! Utils::execute_command( cmd, output, error ); |
al@21050 | 16 error_msg = "<i># " + cmd + "\n" + error + "</i>"; |
al@21050 | 17 break; |
al@21050 | 18 --- a/gparted.in |
al@21050 | 19 +++ b/gparted.in |
al@21050 | 20 @@ -30,7 +30,7 @@ |
al@21050 | 21 # |
al@21050 | 22 # Only permit one instance of GParted to execute at a time |
al@21050 | 23 # |
al@21050 | 24 -if test "z`ps -e | grep gpartedbin`" != "z"; then |
al@21050 | 25 +if test "z`pgrep gpartedbin`" != "z"; then |
al@21050 | 26 echo "The process gpartedbin is already running." |
al@21050 | 27 echo "Only one gpartedbin process is permitted." |
al@21050 | 28 exit 1 |
al@21050 | 29 @@ -94,7 +94,7 @@ |
al@21050 | 30 HAVE_SYSTEMCTL=no |
al@21050 | 31 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do |
al@21050 | 32 if test -x "$k/systemctl"; then |
al@21050 | 33 - if test "z`ps -e | grep systemd`" != "z"; then |
al@21050 | 34 + if test "z`pgrep systemd`" != "z"; then |
al@21050 | 35 HAVE_SYSTEMCTL=yes |
al@21050 | 36 break |
al@21050 | 37 fi |
al@21050 | 38 @@ -107,7 +107,7 @@ |
al@21050 | 39 # |
al@21050 | 40 HAVE_UDISKS2_INHIBIT=no |
al@21050 | 41 if test -x "/usr/lib/udisks2/udisks2-inhibit"; then |
al@21050 | 42 - if test "z`ps -e | grep 'udisksd'`" != "z"; then |
al@21050 | 43 + if test "z`pgrep 'udisksd'`" != "z"; then |
al@21050 | 44 HAVE_UDISKS2_INHIBIT=yes |
al@21050 | 45 fi |
al@21050 | 46 fi |
al@21050 | 47 @@ -119,7 +119,7 @@ |
al@21050 | 48 HAVE_UDISKS=no |
al@21050 | 49 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do |
al@21050 | 50 if test -x "$k/udisks"; then |
al@21050 | 51 - if test "z`ps -e | grep udisks-daemon`" != "z"; then |
al@21050 | 52 + if test "z`pgrep udisks-daemon`" != "z"; then |
al@21050 | 53 HAVE_UDISKS=yes |
al@21050 | 54 break |
al@21050 | 55 fi |
al@21050 | 56 @@ -133,7 +133,7 @@ |
al@21050 | 57 HAVE_HAL_LOCK=no |
al@21050 | 58 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do |
al@21050 | 59 if test -x "$k/hal-lock"; then |
al@21050 | 60 - if test "z`ps -e | grep hald`" != "z"; then |
al@21050 | 61 + if test "z`pgrep hald`" != "z"; then |
al@21050 | 62 HAVE_HAL_LOCK=yes |
al@21050 | 63 break |
al@21050 | 64 fi |