Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLord Anton Hvornum <anton.feeds@gmail.com>2018-05-05 19:15:05 +0200
committerLord Anton Hvornum <anton.feeds@gmail.com>2018-05-05 19:15:05 +0200
commit0fbebe6207a8ee1aa5dcff6eb1264f95fe59a808 (patch)
treece4544c6a19367a6580936cd304ae72bab994486
parent8c6185710e2b5de3bd854124b7a9c66c4f2572ca (diff)
parentba09d311a21bdc5757237253d07a21019fceedcb (diff)
Merge branch 'master' into net-deploy
-rw-r--r--README.md4
-rw-r--r--archinstall.py28
2 files changed, 14 insertions, 18 deletions
diff --git a/README.md b/README.md
index 1921e7ac..8138ae0d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Just a bare bone automated [Arch](https://wiki.archlinux.org/index.php/Arch_Linu
# cd ~/archlive
# echo -e "git\npython-psutil" >> packages.both
- # echo "git clone -b net-deploy --single-branch https://github.com/Torxed/archinstall.git" >> ./airootfs/root/customize_airootfs.sh
+ # echo "git clone https://github.com/Torxed/archinstall.git" >> ./airootfs/root/customize_airootfs.sh
# echo "chmod +x ~/archinstall/archinstall.py" >> ./airootfs/root/customize_airootfs.sh
# mkdir ./airootfs/etc/skel
# echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sh -c ~/archinstall/archinstall.py' >> ./airootfs/etc/skel/.zprofile
@@ -19,7 +19,7 @@ Whenever this live-cd boots, from here on now - it'll run `archinstall.py`.
# Manually run it on a booted Live CD
- # git clone -b net-deploy --single-branch https://github.com/Torxed/archinstall.git
+ # git clone https://github.com/Torxed/archinstall.git
# python3 ./archinstall/archinstall.py
# Rerunning a installation
diff --git a/archinstall.py b/archinstall.py
index 1966ea6e..49e2b878 100644
--- a/archinstall.py
+++ b/archinstall.py
@@ -85,9 +85,10 @@ def update_git():
def device_state(name):
# Based out of: https://askubuntu.com/questions/528690/how-to-get-list-of-all-non-removable-disk-device-names-ssd-hdd-and-sata-ide-onl/528709#528709
- with open('/sys/block/{}/device/block/{}/removable'.format(name, name)) as f:
- if f.read(1) == '1':
- return
+ if os.path.isfile('/sys/block/{}/device/block/{}/removable'.format(name, name)):
+ with open('/sys/block/{}/device/block/{}/removable'.format(name, name)) as f:
+ if f.read(1) == '1':
+ return
path = rootdir_pattern.sub('', os.readlink('/sys/block/{}'.format(name)))
hotplug_buses = ("usb", "ieee1394", "mmc", "pcmcia", "firewire")
@@ -100,20 +101,15 @@ def device_state(name):
return True
def grab_partitions(dev):
- o = run('parted -m -s {} p'.format(dev)).decode('UTF-8')
+ drive_name = os.path.basename(dev)
parts = oDict()
- for line in o.split('\n'):
- if ':' in line:
- data = line.split(':')
- if data[0].isdigit():
- parts[int(data[0])] = {
- 'start' : data[1],
- 'end' : data[2],
- 'size' : data[3],
- 'sum' : data[4],
- 'label' : data[5],
- 'options' : data[6]
- }
+ o = run('lsblk -o name -J -b {dev}'.format(dev=dev))
+ r = json.loads(o)
+ for part in r['blockdevices'][0]['children']:
+ parts[part['name'][len(drive_name):]] = {
+ # TODO: Grab partition info and store here?
+ }
+
return parts
def update_drive_list():