791adcfcb7
If devicepersistency="by-label" is set in the KIWI description it will correctly operate on the fstab values but still uses the UUID based setting for root= in the grub config. This commit allows to set root=LABEL=... in the grub config in case the devicepersistency requested it. In order for this to work this commit also had to increase the scope of the grub helper method _fix_grub_root_device_reference which is now called in any case. This Fixes #1757
88 lines
2.3 KiB
Python
88 lines
2.3 KiB
Python
# Copyright (c) 2015 SUSE Linux GmbH. All rights reserved.
|
|
#
|
|
# This file is part of kiwi.
|
|
#
|
|
# kiwi is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# kiwi is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with kiwi. If not, see <http://www.gnu.org/licenses/>
|
|
#
|
|
import os
|
|
import re
|
|
|
|
# project
|
|
from kiwi.command import Command
|
|
|
|
|
|
class BlockID:
|
|
"""
|
|
**Get information from a block device**
|
|
|
|
:param str device:
|
|
block device node name name. The device can
|
|
also be specified as UUID=<uuid>
|
|
|
|
"""
|
|
def __init__(self, device):
|
|
uuid_format = re.match(r'^UUID=(.*)', device)
|
|
if uuid_format:
|
|
blkid_result = Command.run(
|
|
['blkid', '--uuid', uuid_format.group(1)]
|
|
)
|
|
self.device = blkid_result.output.strip(os.linesep)
|
|
else:
|
|
self.device = device
|
|
|
|
def get_label(self):
|
|
"""
|
|
Retrieve filesystem label from block device
|
|
|
|
:return: block device label
|
|
|
|
:rtype: str
|
|
"""
|
|
return self.get_blkid('LABEL')
|
|
|
|
def get_uuid(self):
|
|
"""
|
|
Retrieve filesystem uuid from block device
|
|
|
|
:return: uuid for the filesystem of the block device
|
|
|
|
:rtype: str
|
|
"""
|
|
return self.get_blkid('UUID')
|
|
|
|
def get_filesystem(self):
|
|
"""
|
|
Retrieve filesystem type from block device
|
|
|
|
:return: filesystem type
|
|
|
|
:rtype: str
|
|
"""
|
|
return self.get_blkid('TYPE')
|
|
|
|
def get_blkid(self, id_type):
|
|
"""
|
|
Retrieve information for specified metadata ID from block device
|
|
|
|
:param string id_type: metadata ID, see man blkid for details
|
|
|
|
:return: ID of the block device
|
|
|
|
:rtype: str
|
|
"""
|
|
blkid_result = Command.run(
|
|
['blkid', self.device, '-s', id_type, '-o', 'value']
|
|
)
|
|
return blkid_result.output.strip(os.linesep)
|