Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ssuks] Add support for attachment section
  • Loading branch information
Bernd Wachter committed Aug 30, 2013
1 parent bb83192 commit 8166af9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 11 deletions.
26 changes: 16 additions & 10 deletions ssuks/ssukickstarter.cpp
Expand Up @@ -127,18 +127,23 @@ QStringList SsuKickstarter::repos(){
return result;
}

QStringList SsuKickstarter::packages(){
QStringList SsuKickstarter::packagesSection(QString name){
QStringList result;

// insert @vendor configuration device
QString configuration = QString("@%1 Configuration %2")
.arg(repoOverride.value("brand"))
.arg(deviceModel);
result.append(configuration);
if (name == "packages") {
// insert @vendor configuration device
QString configuration = QString("@%1 Configuration %2")
.arg(repoOverride.value("brand"))
.arg(deviceModel);
result.append(configuration);

result.sort();
result.removeDuplicates();
} else {
result = commandSection(name);
}

result.sort();
result.removeDuplicates();
result.prepend("%packages");
result.prepend("%" + name);
result.append("%end");
return result;
}
Expand Down Expand Up @@ -324,7 +329,8 @@ bool SsuKickstarter::write(QString kickstart){
kout << commandSection(section).join("\n") << endl << endl;
}
kout << repos().join("\n") << endl << endl;
kout << packages().join("\n") << endl << endl;
kout << packagesSection("packages").join("\n") << endl << endl;
kout << packagesSection("attachment").join("\n") << endl << endl;
// TODO: now that extending scriptlet section is might make sense to make it configurable
kout << scriptletSection("pre", Chroot).join("\n") << endl << endl;
kout << scriptletSection("post", Chroot).join("\n") << endl << endl;
Expand Down
2 changes: 1 addition & 1 deletion ssuks/ssukickstarter.h
Expand Up @@ -36,7 +36,7 @@ class SsuKickstarter {
QStringList commands();
/// read a command section from file system
QStringList commandSection(const QString &section, const QString &description="");
QStringList packages();
QStringList packagesSection(QString name);
QString replaceSpaces(const QString &value);
QStringList repos();
QStringList scriptletSection(QString name, int flags=Chroot);
Expand Down

0 comments on commit 8166af9

Please sign in to comment.