Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
snf-image-creator
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
itminedu
snf-image-creator
Commits
e981232e
Commit
e981232e
authored
8 years ago
by
Nikos Skalkotos
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix-0.10.1'
parents
de327119
3cf0a89c
No related branches found
Branches containing commit
Tags
0.10.1
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ChangeLog
+3
-0
3 additions, 0 deletions
ChangeLog
image_creator/os_type/linux.py
+7
-7
7 additions, 7 deletions
image_creator/os_type/linux.py
image_creator/version.py
+2
-1
2 additions, 1 deletion
image_creator/version.py
version
+1
-1
1 addition, 1 deletion
version
with
13 additions
and
9 deletions
ChangeLog
+
3
−
0
View file @
e981232e
2016-09-27, v0.10.1
* Clear /etc/machine-id instead of removing it
2016-07-28, v0.10
2016-07-28, v0.10
* Detect Bitnami images
* Detect Bitnami images
* Support changing the default "images" container when registering an
* Support changing the default "images" container when registering an
...
...
This diff is collapsed.
Click to expand it.
image_creator/os_type/linux.py
+
7
−
7
View file @
e981232e
...
@@ -333,15 +333,15 @@ class Linux(Unix):
...
@@ -333,15 +333,15 @@ class Linux(Unix):
self
.
image
.
g
.
aug_save
()
self
.
image
.
g
.
aug_save
()
self
.
image
.
g
.
aug_close
()
self
.
image
.
g
.
aug_close
()
@sysprep
(
'
Remov
ing local machine ID configuration file
'
,
@sysprep
(
'
Clear
ing local machine ID configuration file
'
,
display
=
"
Remove
local machine ID configuration file
"
)
display
=
'
Clear
local machine ID configuration file
'
)
def
_
remove
_local_machine_id_configuration_file
(
self
):
def
_
clear
_local_machine_id_configuration_file
(
self
):
"""
Remove
the /etc/machine-id file if present. This file is used by
"""
Clear
the /etc/machine-id file if present. This file is used by
systemd to uniquelly identify systems and will be
created
automatically
systemd to uniquelly identify systems and will be automatically
on the next boot if
not present
.
"""
populated
on the next boot if
empty
.
"""
if
self
.
image
.
g
.
is_file
(
'
/etc/machine-id
'
):
if
self
.
image
.
g
.
is_file
(
'
/etc/machine-id
'
):
self
.
image
.
g
.
rm
(
'
/etc/machine-id
'
)
self
.
image
.
g
.
truncate
(
'
/etc/machine-id
'
)
def
_persistent_grub1
(
self
,
new_root
):
def
_persistent_grub1
(
self
,
new_root
):
"""
Replaces non-persistent device name occurrences with persistent
"""
Replaces non-persistent device name occurrences with persistent
...
...
This diff is collapsed.
Click to expand it.
image_creator/version.py
+
2
−
1
View file @
e981232e
__version__
=
"
0.10
"
__version__
=
"
0.10.1
"
This diff is collapsed.
Click to expand it.
version
+
1
−
1
View file @
e981232e
0.10
0.10
.1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment