pkgs/tools/misc/calamares/nonroot.patch

   1 diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp
   2 index c7146c2d7..e165d9a8f 100644
   3 --- a/src/libcalamares/utils/Runner.cpp
   4 +++ b/src/libcalamares/utils/Runner.cpp
   5 @@ -140,13 +140,13 @@ Calamares::Utils::Runner::run()
   6      }
   7      if ( m_location == RunLocation::RunInTarget )
   8      {
   9 -        process.setProgram( "chroot" );
  10 -        process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command );
  11 +        process.setProgram( "pkexec" );
  12 +        process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command );
  13      }
  14      else
  15      {
  16 -        process.setProgram( "env" );
  17 -        process.setArguments( m_command );
  18 +        process.setProgram( "pkexec" );
  19 +        process.setArguments( QStringList { "env" } + m_command );
  20      }
  21
  22      if ( m_output )
  23 diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
  24 index a3318d1a0..5fbe202fd 100644
  25 --- a/src/modules/mount/main.py
  26 +++ b/src/modules/mount/main.py
  27 @@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions):
  28
  29      # Ensure that the created directory has the correct SELinux context on
  30      # SELinux-enabled systems.
  31 -    os.makedirs(mount_point, exist_ok=True)
  32 +    subprocess.check_call(["pkexec", "mkdir", "-p", mount_point])
  33 +
  34      try:
  35          subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])
  36      except FileNotFoundError as e:
  37 @@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions):
  38          for s in btrfs_subvolumes:
  39              if not s["subvolume"]:
  40                  continue
  41 -            os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True)
  42 -            subprocess.check_call(["btrfs", "subvolume", "create",
  43 +            subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])])
  44 +            subprocess.check_call(["pkexec", "btrfs", "subvolume", "create",
  45                                     root_mount_point + s["subvolume"]])
  46              if s["mountPoint"] == "/":
  47                  # insert the root subvolume into global storage
  48                  libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"])
  49 -        subprocess.check_call(["umount", "-v", root_mount_point])
  50 +        subprocess.check_call(["pkexec", "umount", "-v", root_mount_point])
  51
  52          device = partition["device"]
  53
  54 diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
  55 index ca7219ca4..6ac682ba4 100644
  56 --- a/src/modules/welcome/checker/GeneralRequirements.cpp
  57 +++ b/src/modules/welcome/checker/GeneralRequirements.cpp
  58 @@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )
  59      cWarning() << "GeneralRequirements is configured without libparted.";
  60      return false;
  61  #else
  62 -    return check_big_enough( requiredSpace );
  63 +    return big_enough( requiredSpace );
  64  #endif
  65  }
  66
  67 +bool
  68 +GeneralRequirements::big_enough( qint64 requiredSpace )
  69 +{
  70 +    FILE *fpipe;
  71 +    char command[128];
  72 +    snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace);
  73 +    char c = 0;
  74 +
  75 +    if (0 == (fpipe = (FILE*)popen(command, "r")))
  76 +    {
  77 +        cWarning() << "Failed to check storage size.";
  78 +        return false;
  79 +    }
  80 +
  81 +    while (fread(&c, sizeof c, 1, fpipe))
  82 +    {
  83 +        pclose(fpipe);
  84 +        return true;
  85 +    }
  86 +
  87 +    pclose(fpipe);
  88 +
  89 +    return false;
  90 +}
  91
  92  bool
  93  GeneralRequirements::checkEnoughRam( qint64 requiredRam )
  94 diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h
  95 index b6646da11..ea27324fa 100644
  96 --- a/src/modules/welcome/checker/GeneralRequirements.h
  97 +++ b/src/modules/welcome/checker/GeneralRequirements.h
  98 @@ -36,6 +36,7 @@ private:
  99      bool checkHasPower();
 100      bool checkHasInternet();
 101      bool checkIsRoot();
 102 +    bool big_enough( qint64 requiredSpace );
 103
 104      qreal m_requiredStorageGiB;
 105      qreal m_requiredRamGiB;