X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Fovs-switch-setup;h=e6e26fb3a86ce0e5cdb21ae83ec15d7e80b269f0;hb=823c5699d4de7bf726f988e1ca6197fb2400f388;hp=7a720727c119961a35a588e4be2a21e3769110a7;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/debian/ovs-switch-setup b/debian/ovs-switch-setup
index 7a720727..e6e26fb3 100755
--- a/debian/ovs-switch-setup
+++ b/debian/ovs-switch-setup
@@ -15,8 +15,8 @@ my $debconf_owner = 'openvswitch-switch';
 
 my $default = '/etc/default/openvswitch-switch';
 my $template = '/usr/share/openvswitch/switch/default.template';
-my $etc = '/etc/openvswitch-switch';
-my $rundir = '/var/run';
+my $etc = '/etc/openvswitch';
+my $rundir = '/var/run/openvswitch';
 my $privkey_file = "$etc/of0-privkey.pem";
 my $req_file = "$etc/of0-req.pem";
 my $cert_file = "$etc/of0-cert.pem";
@@ -254,10 +254,10 @@ my (@states) =
        return 'skip' if -e $cert_file;
 
        for (;;) {
-           db_set('send-cert-req', 'yes');
+           db_set('send-cert-req', 'true');
            db_input('send-cert-req');
            return 'prev' if db_go();
-           return 'next' if db_get('send-cert-req') eq 'no';
+           return 'next' if db_get('send-cert-req') eq 'false';
 
            my $pki_uri = db_get('pki-uri');
            my ($pki_base_uri) = $pki_uri =~ m%^([^/]+://[^/]+)/%;
@@ -282,7 +282,7 @@ my (@states) =
        db_subst('verify-controller-ca', 'fingerprint', $cacert_fingerprint);
        db_input('verify-controller-ca');
        return 'prev' if db_go();
-       return 'next' if db_get('verify-controller-ca') eq 'yes';
+       return 'next' if db_get('verify-controller-ca') eq 'true';
        unlink($cacert_file);
        return 'prev';
    },
@@ -291,10 +291,10 @@ my (@states) =
        return 'skip' if -e $cert_file;
 
        for (;;) {
-           db_set('fetch-switch-cert', 'yes');
+           db_set('fetch-switch-cert', 'true');
            db_input('fetch-switch-cert');
            return 'prev' if db_go();
-           exit(1) if db_get('fetch-switch-cert') eq 'no';
+           exit(1) if db_get('fetch-switch-cert') eq 'false';
 
            my $pki_uri = db_get('pki-uri');
            my $url = "$pki_uri/switchca/certs/$req_fingerprint-cert.pem";