Skip to content

Commit

Permalink
Merge pull request #708 from yast/add-backup-and-upgrade-rnc
Browse files Browse the repository at this point in the history
Add backup and upgrade rnc
  • Loading branch information
imobachgs committed Sep 24, 2020
2 parents d1cfce8 + 31184c6 commit 700e5c9
Show file tree
Hide file tree
Showing 7 changed files with 80 additions and 1 deletion.
7 changes: 7 additions & 0 deletions modconfig/README.md
@@ -0,0 +1,7 @@
# AutoYaST-specific Desktop Files

The files included in this directory are installed in the `/usr/share/autoinstall/modules` and are
only used by AutoYaST. The format of those files is [documented in the yast2
repository](https://github.com/yast/yast-yast2/blob/master/doc/desktop_file.md). Additionally, these
files are used in order to decide which sections are included in the schema (check the
`src/autoyast-rnc` directory for the schema definition files).
24 changes: 24 additions & 0 deletions modconfig/backup.desktop
@@ -0,0 +1,24 @@
[Desktop Entry]
Type=Application
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;

X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
X-SuSE-YaST-Call=backup

X-SuSE-YaST-Group=System
X-SuSE-YaST-Argument=
X-SuSE-YaST-RootOnly=true
X-SuSE-YaST-AutoInst=write
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=backup
X-SuSE-YaST-AutoInstPath=install
X-SuSE-YaST-AutoInstSchema=backup.rnc

Icon=yast-backup
Exec=

Name=Backup Options
GenericName=Backup Autoinstallation Options
StartupNotify=true
24 changes: 24 additions & 0 deletions modconfig/upgrade.desktop
@@ -0,0 +1,24 @@
[Desktop Entry]
Type=Application
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;

X-KDE-ModuleType=Library
X-KDE-HasReadOnlyMode=true
X-SuSE-YaST-Call=upgrade

X-SuSE-YaST-Group=System
X-SuSE-YaST-Argument=
X-SuSE-YaST-RootOnly=true
X-SuSE-YaST-AutoInst=write
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=upgrade
X-SuSE-YaST-AutoInstPath=install
X-SuSE-YaST-AutoInstSchema=upgrade.rnc

Icon=yast-upgrade
Exec=

Name=Upgrade Options
GenericName=Upgrade Autoinstallation Options
StartupNotify=true
6 changes: 6 additions & 0 deletions package/autoyast2.changes
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 24 13:04:47 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- Add the schema for 'backup' and 'upgrade' sections (bsc#1176834).
- 4.3.53

-------------------------------------------------------------------
Thu Sep 24 11:03:42 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/autoyast2.spec
Expand Up @@ -22,7 +22,7 @@
%endif

Name: autoyast2
Version: 4.3.52
Version: 4.3.53
Release: 0
Summary: YaST2 - Automated Installation
License: GPL-2.0-only
Expand Down
10 changes: 10 additions & 0 deletions src/autoyast-rnc/backup.rnc
@@ -0,0 +1,10 @@
default namespace = "http://www.suse.com/1.0/yast2ns"
namespace config = "http://www.suse.com/1.0/configns"
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"

backup =
element backup {
element modified { BOOLEAN }? &
element remove_old { BOOLEAN }? &
element sysconfig { BOOLEAN }?
}
8 changes: 8 additions & 0 deletions src/autoyast-rnc/upgrade.rnc
@@ -0,0 +1,8 @@
default namespace = "http://www.suse.com/1.0/yast2ns"
namespace config = "http://www.suse.com/1.0/configns"
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"

upgrade =
element upgrade {
element stop_on_solver_conflict { BOOLEAN }?
}

0 comments on commit 700e5c9

Please sign in to comment.