suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

When auto-formatting ext devices, use the -F flag to make it work with unpartioned disks

Browse Source
This commit is contained in:
Rickard Nilsson 2014-05-09 14:32:12 +02:00
parent ea36f3b868
commit b87b6870f8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/tasks/filesystems.nix
View File

@ -187,6 +187,8 @@ in
let let
mountPoint' = escapeSystemdPath fs.mountPoint; mountPoint' = escapeSystemdPath fs.mountPoint;
device' = escapeSystemdPath fs.device; device' = escapeSystemdPath fs.device;
# -F needed to allow bare block device without partitions
mkfsOpts = optional ((builtins.substring 0 3 fs.fsType) == "ext") "-F";
in nameValuePair "mkfs-${device'}" in nameValuePair "mkfs-${device'}"
{ description = "Initialisation of Filesystem ${fs.device}"; { description = "Initialisation of Filesystem ${fs.device}";
wantedBy = [ "${mountPoint'}.mount" ]; wantedBy = [ "${mountPoint'}.mount" ];
@ -201,7 +203,7 @@ in
type=$(blkid -p -s TYPE -o value "${fs.device}" || true) type=$(blkid -p -s TYPE -o value "${fs.device}" || true)
if [ -z "$type" ]; then if [ -z "$type" ]; then
echo "creating ${fs.fsType} filesystem on ${fs.device}..." echo "creating ${fs.fsType} filesystem on ${fs.device}..."
mkfs.${fs.fsType} "${fs.device}" mkfs.${fs.fsType} ${concatStringsSep " " mkfsOpts} "${fs.device}"
fi fi
''; '';
unitConfig.RequiresMountsFor = [ "${dirOf fs.device}" ]; unitConfig.RequiresMountsFor = [ "${dirOf fs.device}" ];