Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop use of long ago removed udevsettle 

Separate udevsettle command was merged into udevadm back in udev 117
(released 2007-11-13) by:
    225cb03bd8
    udevadm: merge all udev tools into a single binary

The oldest supported distributions have these much newer versions of
udev:
  Distro             EOL        udevadm -V
  Debian 8           2020-Apr   215 (combined systemd and udev)
  RHEL / CentOS 7    2024-Jun   219 (combined systemd and udev)
  Ubuntu 16.04 LTS   2021-Apr   229 (combined systemd and udev)
This commit is contained in:
Mike Fleetwood 2019-07-06 16:18:11 +01:00 committed by Curtis Gedak
parent df65fbd468
commit a4c00e03e6
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GParted_Core.cc
View File

@ -76,7 +76,6 @@ const std::time_t SETTLE_DEVICE_PROBE_MAX_WAIT_SECONDS = 1;
const std::time_t SETTLE_DEVICE_APPLY_MAX_WAIT_SECONDS = 10; const std::time_t SETTLE_DEVICE_APPLY_MAX_WAIT_SECONDS = 10;
static bool udevadm_found = false; static bool udevadm_found = false;
static bool udevsettle_found = false;
static bool hdparm_found = false; static bool hdparm_found = false;
static const Glib::ustring GPARTED_BUG( _("GParted Bug") ); static const Glib::ustring GPARTED_BUG( _("GParted Bug") );
@ -130,7 +129,6 @@ Glib::ustring GParted_Core::get_version_and_config_string()
void GParted_Core::find_supported_core() void GParted_Core::find_supported_core()
{ {
udevadm_found = ! Glib::find_program_in_path( "udevadm" ).empty(); udevadm_found = ! Glib::find_program_in_path( "udevadm" ).empty();
udevsettle_found = ! Glib::find_program_in_path( "udevsettle" ).empty();
hdparm_found = ! Glib::find_program_in_path( "hdparm" ).empty(); hdparm_found = ! Glib::find_program_in_path( "hdparm" ).empty();
} }
@ -4218,9 +4216,7 @@ bool GParted_Core::commit_to_os( PedDisk* lp_disk, std::time_t timeout )
void GParted_Core::settle_device( std::time_t timeout ) void GParted_Core::settle_device( std::time_t timeout )
{ {
if ( udevsettle_found ) if (udevadm_found)
Utils::execute_command( "udevsettle --timeout=" + Utils::num_to_str( timeout ) ) ;
else if ( udevadm_found )
Utils::execute_command( "udevadm settle --timeout=" + Utils::num_to_str( timeout ) ) ; Utils::execute_command( "udevadm settle --timeout=" + Utils::num_to_str( timeout ) ) ;
else else
sleep( timeout ) ; sleep( timeout ) ;